diff options
Diffstat (limited to 'tests/auto/qml/qqmlmoduleplugin/pluginVersion')
| -rw-r--r-- | tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt | 8 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt index d74a877f96..b5ea40704a 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from pluginVersion.pro. ##################################################################### -## pluginVersion Plugin: +## pluginVersion Generic Library: ##################################################################### -add_qt_plugin(pluginVersion +add_cmake_library(pluginVersion + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlVersionPluginType" SOURCES plugin.cpp @@ -19,6 +20,7 @@ add_qt_plugin(pluginVersion ) #### Keys ignored in scope 1:.:.:pluginVersion.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" + +qt_autogen_tools_initial_setup(pluginVersion) diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt index f7f4d9e714..b3f448f669 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from pluginVersion.pro. ##################################################################### -## pluginVersion Plugin: +## pluginVersion Generic Library: ##################################################################### -add_qt_plugin(pluginVersion +add_cmake_library(pluginVersion + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlVersionPluginType" -# special case begin - TYPE qml_plugin -# special case end SOURCES plugin.cpp LIBRARIES @@ -22,10 +20,10 @@ add_qt_plugin(pluginVersion ) #### Keys ignored in scope 1:.:.:pluginVersion.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" +qt_autogen_tools_initial_setup(pluginVersion) # special case begin file(COPY qmldir DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlVersionPluginType" |