summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@qt.io>2017-01-05 14:09:25 +0100
committerJani Heikkinen <jani.heikkinen@qt.io>2017-01-09 09:38:17 +0000
commit48a1f953de90b613ff4fce784dde33328cbfef7d (patch)
treefad51a854220b72560ab155eb685f1dd236323ef
parent1bb1eed9ee23f975ee1c132fa77f480fe91352d6 (diff)
Fix virtual table mismatch in QWaylandWlShellSurface
QWaylandWlShellSurface::createIntegration is a virtual function that is removed if QT_WAYLAND_COMPOSITOR_QUICK is not defined. This macro is defined in src/compositor/... and needs to be replicated here. It is set unconditionally here, since having imports implies having Qt Quick. Change-Id: I563c6de01af12721b0b5f2ec2e9faf787adf6794 Task-number: QTBUG-57838 Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org>
-rw-r--r--src/imports/compositor/compositor.pro2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/compositor/compositor.pro b/src/imports/compositor/compositor.pro
index a97f90f4..26cbe474 100644
--- a/src/imports/compositor/compositor.pro
+++ b/src/imports/compositor/compositor.pro
@@ -15,6 +15,8 @@ COMPOSITOR_QML_FILES += \
WaylandCursorItem.qml \
qmldir
+DEFINES += QT_WAYLAND_COMPOSITOR_QUICK
+
# Create the resource file
GENERATED_RESOURCE_FILE = $$OUT_PWD/compositor.qrc