1 files changed, 8 insertions, 9 deletions
diff --git a/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.cpp b/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.cpp
index 798900bbce..7d68571c24 100644
--- a/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.cpp
+++ b/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.cpp
@@ -49,8 +49,7 @@
 #include <QtGui/QPlatformNativeInterface>
 #include <QtGui/QPlatformWindow>
 #include <QtGui/QtEvents>
-#include <QtGui/QWidget>
-#include <QtGui/QApplication>
+#include <QtGui/QGuiApplication>
 
 #include <QDebug>
 
@@ -237,15 +236,15 @@ void QWaylandWindowManagerIntegration::wlHandleWindowPropertyChange(void *data,
     QPlatformNativeInterface *nativeInterface = qApp->platformNativeInterface();
     QWaylandWindowManagerIntegration *inst = QWaylandWindowManagerIntegration::instance();
 
-    QWidgetList widgets = qApp->topLevelWidgets();
-    foreach (QWidget *widget, widgets) {
-        QPlatformWindow *platformWindowForWidget = widget->platformWindow();
-        if (!platformWindowForWidget)
+    QList<QWindow *> windows = qApp->topLevelWindows();
+    foreach (QWindow *window, windows) {
+        QPlatformWindow *platformWindowForWindow = window->handle();
+        if (!platformWindowForWindow)
             continue;
-        QWaylandWindow *window = static_cast<QWaylandWindow*>(platformWindowForWidget);
-        wl_surface *windowSurface = (wl_surface*)nativeInterface->nativeResourceForWidget(QByteArray("surface"), widget);
+        QWaylandWindow *waylandWindow = static_cast<QWaylandWindow*>(platformWindowForWindow);
+        wl_surface *windowSurface = (wl_surface*)nativeInterface->nativeResourceForWindow(QByteArray("surface"), window);
         if (windowSurface == surface) {
-            inst->handleWindowPropertyChange(window, QString(propertyName), variantValue);
+            inst->handleWindowPropertyChange(waylandWindow, QString(propertyName), variantValue);
             break;
         }
     }