diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2022-06-10 15:51:08 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2023-01-30 10:45:04 +0100 |
| commit | 1d090673bf7619db95c19bfcb0f7797b8dc2ad27 (patch) | |
| tree | 110b30ba41fbe35c5a1c7db330a80274cd0c0217 /examples/quickcontrols/chattutorial | |
| parent | bdbe02dea40b0da4589cf534c86604c8ef1f1f82 (diff) | |
CMake: Allow omitting the version of QML modules
Also, drop all the VERSION 1.0 lines from the examples and tests. 1.0 is
actually a bad default version since it's before all the Qt versions.
[ChangeLog][QML] You can now omit the VERSION argument to
qt_add_qml_module(). This will automatically generate the highest
possible version.
Task-number: QTBUG-99146
Change-Id: Ic10ec69b87c224e0e94e1785f65653815d4c778c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
(cherry picked from commit 2d44365f69b9bc946d085c6b149e2ac319700265)
Diffstat (limited to 'examples/quickcontrols/chattutorial')
5 files changed, 0 insertions, 5 deletions
diff --git a/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt index e75da2d2ef..52a9dcb19b 100644 --- a/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt +++ b/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt @@ -27,7 +27,6 @@ target_link_libraries(chattutorial-chapter1 PRIVATE qt_add_qml_module(chattutorial-chapter1 URI chapter1 - VERSION 1.0 QML_FILES "main.qml" ) diff --git a/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt index 4bf3e834cd..0669626a06 100644 --- a/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt +++ b/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt @@ -27,7 +27,6 @@ target_link_libraries(chattutorial-chapter2 PRIVATE qt_add_qml_module(chattutorial-chapter2 URI chapter2 - VERSION 1.0 QML_FILES "main.qml" RESOURCES diff --git a/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt index d46fd3455d..e55597f2c8 100644 --- a/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt +++ b/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt @@ -28,7 +28,6 @@ target_link_libraries(chattutorial-chapter3 PRIVATE # Resources: qt_add_qml_module(chattutorial-chapter3 URI chapter3 - VERSION 1.0 QML_FILES "ContactPage.qml" "ConversationPage.qml" diff --git a/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt index cf6985cfe8..c26fe1416b 100644 --- a/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt +++ b/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt @@ -31,7 +31,6 @@ target_link_libraries(chattutorial-chapter4 PRIVATE # Resources: qt_add_qml_module(chattutorial-chapter4 URI chapter4 - VERSION 1.0 QML_FILES "ContactPage.qml" "ConversationPage.qml" diff --git a/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt index 0e72bc31f1..39126e51bd 100644 --- a/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt +++ b/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt @@ -31,7 +31,6 @@ target_link_libraries(chattutorial-chapter5 PRIVATE # Resources: qt_add_qml_module(chattutorial-chapter5 URI chapter5 - VERSION 1.0 QML_FILES "+Material/ChatToolBar.qml" "ChatToolBar.qml" |