diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-28 10:47:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-28 12:24:42 +0200 |
| commit | 6169341cbbeebdd6deed7c012b2ba79e1f6d95ff (patch) | |
| tree | dd3dd688eabf504913df465bb1a384521fcafda4 /src/client/qwaylandwindowmanagerintegration_p.h | |
| parent | 87499ddd653fb20796c2dd2eabac37b45240ef1c (diff) | |
| parent | 3dc9cfdbd2771c28c770d432b99e571db43fe599 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1
Conflicts:
src/client/qwaylandwindow.cpp
Change-Id: I80ead87f3e1f36299b1bf9cc9c7db6cd48c0e86f
Diffstat (limited to 'src/client/qwaylandwindowmanagerintegration_p.h')
| -rw-r--r-- | src/client/qwaylandwindowmanagerintegration_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/qwaylandwindowmanagerintegration_p.h b/src/client/qwaylandwindowmanagerintegration_p.h index 612cda43e..c5ceb6d5b 100644 --- a/src/client/qwaylandwindowmanagerintegration_p.h +++ b/src/client/qwaylandwindowmanagerintegration_p.h @@ -38,7 +38,7 @@ #include <QtCore/QScopedPointer> #include <wayland-client.h> -#include <qpa/qplatformservices.h> +#include <QtPlatformSupport/private/qgenericunixservices_p.h> #include <QtWaylandClient/private/qwayland-windowmanager.h> #include <QtWaylandClient/private/qwaylandclientexport_p.h> @@ -52,7 +52,7 @@ class QWaylandDisplay; class QWaylandWindowManagerIntegrationPrivate; -class Q_WAYLAND_CLIENT_EXPORT QWaylandWindowManagerIntegration : public QObject, public QPlatformServices, public QtWayland::qt_windowmanager +class Q_WAYLAND_CLIENT_EXPORT QWaylandWindowManagerIntegration : public QObject, public QGenericUnixServices, public QtWayland::qt_windowmanager { Q_OBJECT Q_DECLARE_PRIVATE(QWaylandWindowManagerIntegration) |