diff options
| author | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:47:57 +0300 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:47:57 +0300 |
| commit | 437c68fbff0f5b92272acd3fd6ef6ff7a1ad8e8e (patch) | |
| tree | d0a9fac3e396f90ba3759af24811f1aaccfb8eff | |
| parent | 29e29b42af59c4200051220b21d65a3bc54154a1 (diff) | |
| parent | 947361a7dc8db093d0b8e1ec5ac953470a180259 (diff) | |
| download | qtx11extras-437c68fbff0f5b92272acd3fd6ef6ff7a1ad8e8e.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I5e71d0948a944085be782f8a2108bc875d31db51
| -rw-r--r-- | src/x11extras/qx11info_x11.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/qx11info/tst_qx11info.cpp | 11 |
2 files changed, 3 insertions, 14 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() { 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); |