diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-09 14:08:19 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-09 14:08:19 +0200 |
| commit | 5dc3a46a2ac56321a888ada4c15d95cabd3a4159 (patch) | |
| tree | ce6943b33686ee6d4d0bf14000fc3b5376f2c588 /src/plugins | |
| parent | df677b9653d2169cd52fdce34d9fd04a6c1397d7 (diff) | |
Wayland plugin compile fixes.
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylandnativeinterface.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylandshmsurface.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/wayland/wayland.pro | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp b/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp index d056f75125..8a7799e7a9 100644 --- a/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp +++ b/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp @@ -43,7 +43,7 @@ #include "qwaylanddisplay.h" #include "qwaylandwindow.h" -#include <QtGui/private/qapplication_p.h> +#include <QtGui/private/qguiapplication_p.h> void *QWaylandNativeInterface::nativeResourceForWindow(const QByteArray &resourceString, QWindow *window) { @@ -66,7 +66,7 @@ QWaylandScreen * QWaylandNativeInterface::qPlatformScreenForWindow(QWindow *wind if (window) { screen = static_cast<QWaylandScreen *>(QPlatformScreen::platformScreenForWindow(window)); } else { - screen = static_cast<QWaylandScreen *>(QApplicationPrivate::platformIntegration()->screens()[0]); + screen = static_cast<QWaylandScreen *>(QGuiApplicationPrivate::platformIntegration()->screens()[0]); } return screen; } diff --git a/src/plugins/platforms/wayland/qwaylandshmsurface.cpp b/src/plugins/platforms/wayland/qwaylandshmsurface.cpp index 69e5076a50..4bc54399ee 100644 --- a/src/plugins/platforms/wayland/qwaylandshmsurface.cpp +++ b/src/plugins/platforms/wayland/qwaylandshmsurface.cpp @@ -41,7 +41,6 @@ #include "qwaylandshmsurface.h" #include <QtCore/qdebug.h> -#include <QtGui/private/qapplication_p.h> #include "qwaylanddisplay.h" #include "qwaylandshmwindow.h" diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro index fa93f8878b..8372d7ac6f 100644 --- a/src/plugins/platforms/wayland/wayland.pro +++ b/src/plugins/platforms/wayland/wayland.pro @@ -36,6 +36,7 @@ INCLUDEPATH += $$PWD QT += gui-private QT += opengl-private QT += core-private +QT += widgets-private include ($$PWD/gl_integration/gl_integration.pri) |