diff options
| author | Alexander Schlarb <alexander@ninetailed.ninja> | 2018-07-29 21:27:28 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2018-08-03 11:29:43 +0000 |
| commit | 2c48ee65e8c3b894caec214641723d0777fc60b8 (patch) | |
| tree | c461ef4f88da83755e8585e4da9591245acedd43 | |
| parent | 3f81cab306946d6beb244ffc53de67a01674607e (diff) | |
| download | qtwayland-2c48ee65e8c3b894caec214641723d0777fc60b8.tar.gz | |
Fix compilation of QtWayland without QtQuick
Change-Id: I0baf542f89274f48bf7d02121a07d64f0f3a001b
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| -rw-r--r-- | src/compositor/compositor_api/compositor_api.pri | 10 | ||||
| -rw-r--r-- | src/compositor/hardware_integration/qwlhardwarelayerintegration_p.h | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/compositor/compositor_api/compositor_api.pri b/src/compositor/compositor_api/compositor_api.pri index e5df0f1f..4a0c0aa6 100644 --- a/src/compositor/compositor_api/compositor_api.pri +++ b/src/compositor/compositor_api/compositor_api.pri @@ -27,7 +27,6 @@ HEADERS += \ compositor_api/qwaylandresource.h \ compositor_api/qwaylandsurfacegrabber.h \ compositor_api/qwaylandoutputmode_p.h \ - compositor_api/qwaylandquickhardwarelayer_p.h \ SOURCES += \ compositor_api/qwaylandcompositor.cpp \ @@ -44,8 +43,7 @@ SOURCES += \ compositor_api/qwaylanddestroylistener.cpp \ compositor_api/qwaylandview.cpp \ compositor_api/qwaylandresource.cpp \ - compositor_api/qwaylandsurfacegrabber.cpp \ - compositor_api/qwaylandquickhardwarelayer.cpp + compositor_api/qwaylandsurfacegrabber.cpp qtConfig(im) { HEADERS += \ @@ -71,14 +69,16 @@ qtHaveModule(quick):qtConfig(opengl) { compositor_api/qwaylandquickcompositor.cpp \ compositor_api/qwaylandquicksurface.cpp \ compositor_api/qwaylandquickoutput.cpp \ - compositor_api/qwaylandquickitem.cpp + compositor_api/qwaylandquickitem.cpp \ + compositor_api/qwaylandquickhardwarelayer.cpp HEADERS += \ compositor_api/qwaylandquickcompositor.h \ compositor_api/qwaylandquicksurface.h \ compositor_api/qwaylandquickoutput.h \ compositor_api/qwaylandquickitem.h \ - compositor_api/qwaylandquickitem_p.h + compositor_api/qwaylandquickitem_p.h \ + compositor_api/qwaylandquickhardwarelayer_p.h QT += qml qml-private quick quick-private } diff --git a/src/compositor/hardware_integration/qwlhardwarelayerintegration_p.h b/src/compositor/hardware_integration/qwlhardwarelayerintegration_p.h index 02de8e8b..1e5fb1a1 100644 --- a/src/compositor/hardware_integration/qwlhardwarelayerintegration_p.h +++ b/src/compositor/hardware_integration/qwlhardwarelayerintegration_p.h @@ -54,7 +54,6 @@ #include <QtWaylandCompositor/qtwaylandcompositorglobal.h> #include <QObject> -#include <QQmlParserStatus> QT_BEGIN_NAMESPACE |