diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-08 11:32:16 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-08 11:32:16 +0200 |
| commit | 64e6eaf559395ee96232db69e0261c4a183e1fb7 (patch) | |
| tree | 18b719b7746e0c70ae70546931e43b364d774716 /src/imports/compositor/compositor.pro | |
| parent | 53ab5e7748340f922f7f32c7d2db4965aa8c2ff2 (diff) | |
| parent | ac80dfb5b921437b699a992d1f211e8edf4d7844 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I5d587b79b96d2b44f1975419a658c259c63fa30d
Diffstat (limited to 'src/imports/compositor/compositor.pro')
| -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 |