diff options
| author | David Faure <faure@kde.org> | 2013-02-04 16:25:55 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-04 16:59:12 +0100 |
| commit | 479c0ce877a4d43a2e86f59d70cf8b01ff3f8a70 (patch) | |
| tree | 968e599ec6d4560f5489042e23b4d67b72a79bed /src/x11extras | |
| parent | 23edef9908802c0b25e73821ac33e578c7acee96 (diff) | |
| download | qtx11extras-479c0ce877a4d43a2e86f59d70cf8b01ff3f8a70.tar.gz | |
QX11Info: return unsigned long rather than Qt::HANDLE.
Qt::HANDLE has changed from unsigned long (on X11) to void* (everywhere)
in Qt5, so we have to use "unsigned long" explicitly here.
Change-Id: I4b16d1492dcb43fde5a4637d33f049854bec898a
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/x11extras')
| -rw-r--r-- | src/x11extras/qx11info_x11.cpp | 4 | ||||
| -rw-r--r-- | src/x11extras/qx11info_x11.h | 2 |
2 files changed, 3 insertions, 3 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(); |