diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-09-16 08:16:21 +0200 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-09-16 08:17:12 +0200 |
| commit | b4233b2f606617542c594e411640ef2867152d29 (patch) | |
| tree | fc1fc95fa2df4ab21478e120feba8b34c1585db5 /src/imports | |
| parent | 92768cf8d48d6fb62e1a0d124ea9cdec447df4d1 (diff) | |
| parent | 382e3292aa0eb6addac84ddefeedc98c7f3b41b2 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/client/qwaylanddatadevice.cpp
src/client/qwaylandinputcontext.cpp
src/client/qwaylandinputdevice.cpp
src/client/qwaylandwindow.cpp
src/compositor/compositor_api/compositor_api.pri
src/compositor/compositor_api/qwaylandquickitem.cpp
Change-Id: Ice0d8c7d869c9c46113d6ee6ba3adf895a71d58f
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/compositor/compositor.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/imports/compositor/compositor.pro b/src/imports/compositor/compositor.pro index f5c7567a0..59dd7824c 100644 --- a/src/imports/compositor/compositor.pro +++ b/src/imports/compositor/compositor.pro @@ -14,8 +14,6 @@ COMPOSITOR_QML_FILES += \ WaylandOutputWindow.qml \ WaylandCursorItem.qml -DEFINES += QT_WAYLAND_COMPOSITOR_QUICK - # Create the resource file GENERATED_RESOURCE_FILE = $$OUT_PWD/compositor.qrc |