diff options
| -rw-r--r-- | src/x11extras/qx11info_x11.cpp | 4 | ||||
| -rw-r--r-- | src/x11extras/qx11info_x11.h | 2 | ||||
| -rw-r--r-- | tests/auto/qx11info/tst_qx11info.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/x11extras/qx11info_x11.cpp b/src/x11extras/qx11info_x11.cpp index db3c0a1..cb534b7 100644 --- a/src/x11extras/qx11info_x11.cpp +++ b/src/x11extras/qx11info_x11.cpp @@ -145,7 +145,7 @@ int QX11Info::appDpiY(int screen) \sa QApplication::desktop() */ -Qt::HANDLE QX11Info::appRootWindow(int screen) +unsigned long QX11Info::appRootWindow(int screen) { if (!qApp) return 0; @@ -160,7 +160,7 @@ Qt::HANDLE QX11Info::appRootWindow(int screen) QDesktopWidget *desktop = QApplication::desktop(); QWindow *window = desktop->windowHandle(); #endif - return Qt::HANDLE(window->winId()); + return window->winId(); } /*! diff --git a/src/x11extras/qx11info_x11.h b/src/x11extras/qx11info_x11.h index 224d9d4..15df6f0 100644 --- a/src/x11extras/qx11info_x11.h +++ b/src/x11extras/qx11info_x11.h @@ -58,7 +58,7 @@ public: static int appDpiX(int screen=-1); static int appDpiY(int screen=-1); - static Qt::HANDLE appRootWindow(int screen=-1); + static unsigned long appRootWindow(int screen=-1); static int appScreen(); static unsigned long appTime(); diff --git a/tests/auto/qx11info/tst_qx11info.cpp b/tests/auto/qx11info/tst_qx11info.cpp index 115de70..b680834 100644 --- a/tests/auto/qx11info/tst_qx11info.cpp +++ b/tests/auto/qx11info/tst_qx11info.cpp @@ -81,8 +81,8 @@ void tst_QX11Info::staticFunctionsBeforeQApplication() void *appVisual = QX11Info::appVisual(); QCOMPARE(appVisual, static_cast<void *>(0)); #endif - Qt::HANDLE appRootWindow = QX11Info::appRootWindow(); - QCOMPARE(appRootWindow, static_cast<Qt::HANDLE>(0)); + unsigned long appRootWindow = QX11Info::appRootWindow(); + QCOMPARE(appRootWindow, static_cast<unsigned long>(0)); #if 0 bool appDefaultColormap = QX11Info::appDefaultColormap(); |