diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-09-01 14:56:22 +1000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-02 05:23:07 +0000 |
| commit | cfdbd5ae9bd2c7c40b1fff8fe1eff6c51669e980 (patch) | |
| tree | c3d9e14cf4d89175ceefdebbbff111bd8214af45 | |
| parent | cb636d13ada7fd2f72ee4754412f52540958a098 (diff) | |
Fix WaylandCompositor QT_QML_SOURCE_VERSION usage
This source file property was renamed to QT_QML_SOURCE_VERSIONS and the
PAST_MAJOR_VERSIONS now automatically contribute to the past source
versions. Update the way we specify both for this QML module. This
removes the CMake warnings associated with using the old property name.
Change-Id: Iaff43fe16087916b2f09a44c092ee625f8bed7bd
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
(cherry picked from commit 0c88dbba7c5e24aebe44d5fbf3b938fcb1237007)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/compositor/CMakeLists.txt | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/compositor/CMakeLists.txt b/src/compositor/CMakeLists.txt index e956c3b6c..b6a7b89dc 100644 --- a/src/compositor/CMakeLists.txt +++ b/src/compositor/CMakeLists.txt @@ -188,27 +188,16 @@ qt_internal_add_docs(WaylandCompositor doc/qtwaylandcompositor.qdocconf ) -set(qmlfiles - qmlfiles/WaylandCursorItem.qml - qmlfiles/WaylandOutputWindow.qml -) - -set_source_files_properties(qmlfiles/WaylandOutputWindow.qml PROPERTIES - QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_TYPENAME WaylandOutputWindow -) -set_source_files_properties(qmlfiles/WaylandCursorItem.qml PROPERTIES - QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_TYPENAME WaylandCursorItem -) - if (TARGET Qt::Qml) qt_internal_add_qml_module(WaylandCompositor URI QtWayland.Compositor VERSION ${PROJECT_VERSION} CLASS_NAME QWaylandCompositorPlugin PLUGIN_TARGET qwaylandcompositorplugin - QML_FILES ${qmlfiles} + PAST_MAJOR_VERSIONS 1 + QML_FILES + qmlfiles/WaylandCursorItem.qml + qmlfiles/WaylandOutputWindow.qml DEPENDENCIES QtQuick ) |