diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-14 09:23:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-14 10:19:25 +0100 |
| commit | ea10986a0939cacd34e8d3e026579c8ce3e6ac6c (patch) | |
| tree | 7eaa89a5385d98fcca5dc4f25906130ce958e2d4 /vcl/qt5 | |
| parent | cdd824029edf880650afa46cb439049c7b9f9a93 (diff) | |
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 <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/qt5')
| -rw-r--r-- | vcl/qt5/Qt5System.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
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); } |