vcl/qt5/Qt5System.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
New commits: commit 3b6bef0003820f4def175dde196939e046741e24 Author: Noel Grandin <[email protected]> AuthorDate: Tue Jan 14 09:23:53 2020 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Fri Mar 28 12:00:43 2025 +0100 Silence -Werror,-Wdeprecated-declarations for now ...as seen with qt5 5.13.2-1.fc31 /home/noel/libo2/vcl/qt5/Qt5System.cxx:18:83: error: 'screenCount' is deprecated: Use QGuiApplication::screens() [-Werror,-Wdeprecated-declarations] ^ /home/noel/libo2/vcl/qt5/Qt5System.cxx:22:44: error: 'screenGeometry' is deprecated: Use QGuiApplication::screens() [-Werror,-Wdeprecated-declarations] QRect qRect = QApplication::desktop()->screenGeometry(nScreen); ^ Change-Id: I73385b56f58284fedf5acbfb914177e06f3512d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86736 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> (cherry picked from commit ea10986a0939cacd34e8d3e026579c8ce3e6ac6c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183436 Tested-by: allotropia jenkins <[email protected]> Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/vcl/qt5/Qt5System.cxx b/vcl/qt5/Qt5System.cxx index 283fe58dc84d..4e00a0dd6283 100644 --- a/vcl/qt5/Qt5System.cxx +++ b/vcl/qt5/Qt5System.cxx @@ -15,11 +15,18 @@ #include <Qt5System.hxx> #include <Qt5Tools.hxx> -unsigned int Qt5System::GetDisplayScreenCount() { return QApplication::desktop()->screenCount(); } +unsigned int Qt5System::GetDisplayScreenCount() +{ + SAL_WNODEPRECATED_DECLARATIONS_PUSH + return QApplication::desktop()->screenCount(); + SAL_WNODEPRECATED_DECLARATIONS_POP +} tools::Rectangle Qt5System::GetDisplayScreenPosSizePixel(unsigned int nScreen) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH QRect qRect = QApplication::desktop()->screenGeometry(nScreen); + SAL_WNODEPRECATED_DECLARATIONS_POP return toRectangle(qRect); }
