From d49d4e18a22f41379d391fd8405c5e61cb4acc45 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Fri, 28 Mar 2014 00:00:39 +0100 Subject: Doc: Remove references to nonexistent functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - setAppDpiX() - setAppDpiY() - screen() they only exist in Qt 4.8. Change-Id: Ifca7cf9712a9b822b0776f413451d6bca7c69a37 Reviewed-by: Sze Howe Koh Reviewed-by: Martin Gräßlin Reviewed-by: Friedemann Kleint Reviewed-by: Jędrzej Nowacki --- src/x11extras/qx11info_x11.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/x11extras/qx11info_x11.cpp b/src/x11extras/qx11info_x11.cpp index 9e2cc3b..2a7e495 100644 --- a/src/x11extras/qx11info_x11.cpp +++ b/src/x11extras/qx11info_x11.cpp @@ -100,7 +100,7 @@ bool QX11Info::isPlatformX11() multiscreen), there is only one X screen. Use QDesktopWidget to query for information about Xinerama screens. - \sa setAppDpiX(), appDpiY() + \sa appDpiY() */ int QX11Info::appDpiX(int screen) { @@ -127,7 +127,7 @@ int QX11Info::appDpiX(int screen) multiscreen), there is only one X screen. Use QDesktopWidget to query for information about Xinerama screens. - \sa setAppDpiY(), appDpiX() + \sa appDpiX() */ int QX11Info::appDpiY(int screen) { @@ -181,7 +181,7 @@ unsigned long QX11Info::appRootWindow(int screen) are interested in the monitor information as provided by the X11 RandR extension. This is available through QDesktopWidget and QScreen. - \sa display(), screen() + \sa display() */ int QX11Info::appScreen() { -- cgit v1.2.1 From 947361a7dc8db093d0b8e1ec5ac953470a180259 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Fri, 28 Mar 2014 16:32:57 +0100 Subject: test: Remove dead code around QX11Info::setAppDpi{X,Y} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These functions don't exist for QX11Info. Change-Id: Icb9a4b28c1f97ac8d59c93a29633547c84f6589c Reviewed-by: Jędrzej Nowacki Reviewed-by: David Faure --- tests/auto/qx11info/tst_qx11info.cpp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tests/auto/qx11info/tst_qx11info.cpp b/tests/auto/qx11info/tst_qx11info.cpp index ab741be..602de1d 100644 --- a/tests/auto/qx11info/tst_qx11info.cpp +++ b/tests/auto/qx11info/tst_qx11info.cpp @@ -97,17 +97,6 @@ void tst_QX11Info::staticFunctionsBeforeQApplication() QCOMPARE(appDpiX, 75); QCOMPARE(appDpiY, 75); -#if 0 - // the setAppDpi{X,Y} calls do nothing if QApplication hasn't been - // constructed - QX11Info::setAppDpiX(-1, 120); - QX11Info::setAppDpiY(-1, 120); - appDpiX = QX11Info::appDpiX(); - appDpiY = QX11Info::appDpiY(); - QCOMPARE(appDpiX, 75); - QCOMPARE(appDpiY, 75); -#endif - unsigned long appTime = QX11Info::appTime(); unsigned long appUserTime = QX11Info::appUserTime(); QCOMPARE(appTime, 0ul); -- cgit v1.2.1