diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-14 11:39:42 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-15 12:24:38 +0000 |
| commit | 91e32f86b53bb930405a58e19c84746ee85cdf89 (patch) | |
| tree | 3419986b62355e718551b83a514c1169480a8ed0 /tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule | |
| parent | 387f360b3b2634094889478f2b258e65a70b9aa6 (diff) | |
Regenerate remaining tests to be in sync
Change-Id: I200c8f58ad13bc1bc78409a3ce49348584ba5b51
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule')
| -rw-r--r-- | tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt | 8 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt index 49c3a5fb54..dd74064201 100644 --- a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from preemptedStrictModule.pro. ##################################################################### -## preemptedStrictModule Plugin: +## preemptedStrictModule Generic Library: ##################################################################### -add_qt_plugin(preemptedStrictModule +add_cmake_library(preemptedStrictModule + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptedStrictModule" SOURCES plugin.cpp @@ -19,6 +20,7 @@ add_qt_plugin(preemptedStrictModule ) #### Keys ignored in scope 1:.:.:preemptedStrictModule.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" + +qt_autogen_tools_initial_setup(preemptedStrictModule) diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt index b9dfd31dd3..fe4517571a 100644 --- a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from preemptedStrictModule.pro. ##################################################################### -## preemptedStrictModule Plugin: +## preemptedStrictModule Generic Library: ##################################################################### -add_qt_plugin(preemptedStrictModule +add_cmake_library(preemptedStrictModule + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptedStrictModule" -# special case begin - TYPE qml_plugin -# special case end SOURCES plugin.cpp LIBRARIES @@ -22,10 +20,10 @@ add_qt_plugin(preemptedStrictModule ) #### Keys ignored in scope 1:.:.:preemptedStrictModule.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" +qt_autogen_tools_initial_setup(preemptedStrictModule) # special case begin file(COPY qmldir DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptedStrictModule" |