diff options
Diffstat (limited to 'tests/auto/qml/qmlplugindump/data/dumper')
8 files changed, 42 insertions, 64 deletions
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt index 905d199505..e8b5fb59ff 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from dummy.pro. ##################################################################### -## Dummy Plugin: +## Dummy Generic Library: ##################################################################### -add_qt_plugin(Dummy +add_cmake_library(Dummy + MODULE SOURCES dummy.cpp dummy.h dummy_plugin.cpp dummy_plugin.h @@ -15,16 +16,14 @@ add_qt_plugin(Dummy ) #### Keys ignored in scope 1:.:.:dummy.pro:<TRUE>: -# CONFIG = "qt" "plugin" "-debug_and_release_target" # TEMPLATE = "lib" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:dummy.pro:NOT build_pass AND QT_FEATURE_debug_and_release: -# CONFIG = "release" - #### Keys ignored in scope 3:.:.:dummy.pro:NOT _PRO_FILE_PWD____equals____ss_OUT_PWD: # COPIES = "cp" # cp.files = "qmldir" "plugins.qmltypes" # cp.path = "$$OUT_PWD" + +qt_autogen_tools_initial_setup(Dummy) diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt index db6c8469e5..2278a7423f 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from dummy.pro. ##################################################################### -## Dummy Plugin: +## Dummy Generic Library: ##################################################################### -add_qt_plugin(Dummy -# special case begin - TYPE qml_plugin - OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -# special case end +add_cmake_library(Dummy + MODULE + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES dummy.cpp dummy.h dummy_plugin.cpp dummy_plugin.h @@ -19,22 +17,20 @@ add_qt_plugin(Dummy ) #### Keys ignored in scope 1:.:.:dummy.pro:<TRUE>: -# CONFIG = "qt" "plugin" "-debug_and_release_target" # TEMPLATE = "lib" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:dummy.pro:NOT build_pass AND QT_FEATURE_debug_and_release: -# CONFIG = "release" - #### Keys ignored in scope 3:.:.:dummy.pro:NOT _PRO_FILE_PWD____equals____ss_OUT_PWD: # COPIES = "cp" # cp.files = "qmldir" "plugins.qmltypes" # cp.path = "$$OUT_PWD" +qt_autogen_tools_initial_setup(Dummy) # special case begin get_target_property(binary_dir Dummy BINARY_DIR) file(COPY qmldir plugins.qmltypes DESTINATION ${binary_dir} ) +# special case end diff --git a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt index 442ce7f080..b56eac2165 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from extendedtype.pro. ##################################################################### -## ExtendedType Plugin: +## ExtendedType Generic Library: ##################################################################### -add_qt_plugin(ExtendedType +add_cmake_library(ExtendedType + MODULE SOURCES plugin.cpp plugin.h types.h @@ -15,16 +16,14 @@ add_qt_plugin(ExtendedType ) #### Keys ignored in scope 1:.:.:extendedtype.pro:<TRUE>: -# CONFIG = "qt" "plugin" "-debug_and_release_target" # TEMPLATE = "lib" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:extendedtype.pro:NOT build_pass AND QT_FEATURE_debug_and_release: -# CONFIG = "release" - #### Keys ignored in scope 3:.:.:extendedtype.pro:NOT _PRO_FILE_PWD____equals____ss_OUT_PWD: # COPIES = "cp" # cp.files = "qmldir" "plugins.qmltypes" # cp.path = "$$OUT_PWD" + +qt_autogen_tools_initial_setup(ExtendedType) diff --git a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt index 7917b3643a..11ac920aeb 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from extendedtype.pro. ##################################################################### -## ExtendedType Plugin: +## ExtendedType Generic Library: ##################################################################### -add_qt_plugin(ExtendedType -# special case begin - TYPE qml_plugin - OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -# special case end +add_cmake_library(ExtendedType + MODULE + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES plugin.cpp plugin.h types.h @@ -19,20 +17,17 @@ add_qt_plugin(ExtendedType ) #### Keys ignored in scope 1:.:.:extendedtype.pro:<TRUE>: -# CONFIG = "qt" "plugin" "-debug_and_release_target" # TEMPLATE = "lib" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:extendedtype.pro:NOT build_pass AND QT_FEATURE_debug_and_release: -# CONFIG = "release" - #### Keys ignored in scope 3:.:.:extendedtype.pro:NOT _PRO_FILE_PWD____equals____ss_OUT_PWD: # COPIES = "cp" # cp.files = "qmldir" "plugins.qmltypes" # cp.path = "$$OUT_PWD" +qt_autogen_tools_initial_setup(ExtendedType) # special case begin get_target_property(binary_dir ExtendedType BINARY_DIR) file(COPY qmldir plugins.qmltypes diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt index 536abe9c53..89079d0e0e 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from imports.pro. ##################################################################### -## Imports Plugin: +## Imports Generic Library: ##################################################################### -add_qt_plugin(Imports +add_cmake_library(Imports + MODULE SOURCES imports.cpp imports.h imports_plugin.cpp imports_plugin.h @@ -15,16 +16,14 @@ add_qt_plugin(Imports ) #### Keys ignored in scope 1:.:.:imports.pro:<TRUE>: -# CONFIG = "qt" "plugin" "-debug_and_release_target" # TEMPLATE = "lib" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:imports.pro:NOT build_pass AND QT_FEATURE_debug_and_release: -# CONFIG = "release" - #### Keys ignored in scope 3:.:.:imports.pro:NOT _PRO_FILE_PWD____equals____ss_OUT_PWD: # COPIES = "cp" # cp.files = "qmldir" "plugins.qmltypes" "CompositeImports.qml" # cp.path = "$$OUT_PWD" + +qt_autogen_tools_initial_setup(Imports) diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt index f34ccb84e3..611842f9a3 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from imports.pro. ##################################################################### -## Imports Plugin: +## Imports Generic Library: ##################################################################### -add_qt_plugin(Imports -# special case begin - TYPE qml_plugin - OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -# special case end +add_cmake_library(Imports + MODULE + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES imports.cpp imports.h imports_plugin.cpp imports_plugin.h @@ -19,22 +17,20 @@ add_qt_plugin(Imports ) #### Keys ignored in scope 1:.:.:imports.pro:<TRUE>: -# CONFIG = "qt" "plugin" "-debug_and_release_target" # TEMPLATE = "lib" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:imports.pro:NOT build_pass AND QT_FEATURE_debug_and_release: -# CONFIG = "release" - #### Keys ignored in scope 3:.:.:imports.pro:NOT _PRO_FILE_PWD____equals____ss_OUT_PWD: # COPIES = "cp" # cp.files = "qmldir" "plugins.qmltypes" "CompositeImports.qml" # cp.path = "$$OUT_PWD" +qt_autogen_tools_initial_setup(Imports) # special case begin get_target_property(binary_dir Imports BINARY_DIR) file(COPY qmldir plugins.qmltypes CompositeImports.qml DESTINATION ${binary_dir} ) +# special case end diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt index 04a77f825c..e29fe730f5 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from versions.pro. ##################################################################### -## Versions Plugin: +## Versions Generic Library: ##################################################################### -add_qt_plugin(Versions +add_cmake_library(Versions + MODULE SOURCES versions.cpp versions.h versions_plugin.cpp versions_plugin.h @@ -15,16 +16,14 @@ add_qt_plugin(Versions ) #### Keys ignored in scope 1:.:.:versions.pro:<TRUE>: -# CONFIG = "qt" "plugin" "-debug_and_release_target" # TEMPLATE = "lib" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:versions.pro:NOT build_pass AND QT_FEATURE_debug_and_release: -# CONFIG = "release" - #### Keys ignored in scope 3:.:.:versions.pro:NOT _PRO_FILE_PWD____equals____ss_OUT_PWD: # COPIES = "cpqmldir" # cpqmldir.files = "qmldir" "plugins.qmltypes" # cpqmldir.path = "$$OUT_PWD" + +qt_autogen_tools_initial_setup(Versions) diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt index 88e058f0c9..3b3a6eb77b 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from versions.pro. ##################################################################### -## Versions Plugin: +## Versions Generic Library: ##################################################################### -add_qt_plugin(Versions -# special case begin - TYPE qml_plugin - OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -# special case end +add_cmake_library(Versions + MODULE + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES versions.cpp versions.h versions_plugin.cpp versions_plugin.h @@ -19,20 +17,17 @@ add_qt_plugin(Versions ) #### Keys ignored in scope 1:.:.:versions.pro:<TRUE>: -# CONFIG = "qt" "plugin" "-debug_and_release_target" # TEMPLATE = "lib" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:versions.pro:NOT build_pass AND QT_FEATURE_debug_and_release: -# CONFIG = "release" - #### Keys ignored in scope 3:.:.:versions.pro:NOT _PRO_FILE_PWD____equals____ss_OUT_PWD: # COPIES = "cpqmldir" # cpqmldir.files = "qmldir" "plugins.qmltypes" # cpqmldir.path = "$$OUT_PWD" +qt_autogen_tools_initial_setup(Versions) # special case begin get_target_property(binary_dir Versions BINARY_DIR) file(COPY qmldir plugins.qmltypes |