diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:09:55 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:09:55 +0100 |
| commit | 29e29b42af59c4200051220b21d65a3bc54154a1 (patch) | |
| tree | 536dfd3753991ac5428c7afb8b8302bbaf3e2430 /src/x11extras/qx11info_x11.cpp | |
| parent | dda7f305c4410f2d4135677fa4ee353c96d3c54a (diff) | |
| parent | 01754de4776905205d38d7bc66fa7b7caa0fe79b (diff) | |
| download | qtx11extras-29e29b42af59c4200051220b21d65a3bc54154a1.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I6d27c3ef1242de08a8b9b6ee619c942982d3384c
Diffstat (limited to 'src/x11extras/qx11info_x11.cpp')
| -rw-r--r-- | src/x11extras/qx11info_x11.cpp | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/x11extras/qx11info_x11.cpp b/src/x11extras/qx11info_x11.cpp index 8bea591..9e2cc3b 100644 --- a/src/x11extras/qx11info_x11.cpp +++ b/src/x11extras/qx11info_x11.cpp @@ -52,9 +52,8 @@ #include <qpa/qplatformnativeinterface.h> #include <qpa/qplatformwindow.h> #include <qscreen.h> -#include <qdesktopwidget.h> #include <qwindow.h> -#include <qapplication.h> +#include <qguiapplication.h> #include <xcb/xcb.h> QT_BEGIN_NAMESPACE @@ -160,18 +159,11 @@ unsigned long QX11Info::appRootWindow(int screen) { if (!qApp) return 0; -#if 0 - // This looks like it should work, but gives the wrong value. - QDesktopWidget *desktop = QApplication::desktop(); - QWidget *screenWidget = desktop->screen(screen); - QWindow *window = screenWidget->windowHandle(); -#else Q_UNUSED(screen); - - QDesktopWidget *desktop = QApplication::desktop(); - QWindow *window = desktop->windowHandle(); -#endif - return window->winId(); + QPlatformNativeInterface *native = qApp->platformNativeInterface(); + if (!native) + return 0; + return static_cast<xcb_window_t>(reinterpret_cast<quintptr>(native->nativeResourceForIntegration(QByteArrayLiteral("rootwindow")))); } /*! |