From 5447ccd46914f0fad246cee168fdc15f362eb09f Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 12 Nov 2019 13:10:04 +0100 Subject: [PATCH] Regenerate tests/auto/corelib/mimetypes Change-Id: Id137b8e9f48edd65c4df901f11a8ae917395d6b6 Reviewed-by: Leander Beernaert Reviewed-by: Simon Hausmann Reviewed-by: Qt CMake Build Bot --- .../qmimedatabase-cache/.prev_CMakeLists.txt | 67 +++++++++++++------ .../qmimedatabase-cache/CMakeLists.txt | 58 ++++++++++++---- .../qmimedatabase-xml/.prev_CMakeLists.txt | 67 +++++++++++++------ .../qmimedatabase-xml/CMakeLists.txt | 57 ++++++++++++---- .../mimetypes/qmimetype/CMakeLists.txt | 3 - 5 files changed, 184 insertions(+), 68 deletions(-) diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt index 99709d7731..d109c3a1e6 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt @@ -1,11 +1,14 @@ # Generated from qmimedatabase-cache.pro. +if(NOT QT_FEATURE_private_tests) + return() +endif() + ##################################################################### ## tst_qmimedatabase-cache Test: ##################################################################### add_qt_test(tst_qmimedatabase-cache - GUI SOURCES ../tst_qmimedatabase.h tst_qmimedatabase-cache.cpp @@ -15,54 +18,80 @@ add_qt_test(tst_qmimedatabase-cache # Resources: set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml" - PROPERTIES alias "freedesktop.org.xml" + PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml" ) +set(mimetypes_resource_files + "mime/packages/freedesktop.org.xml" +) + add_qt_resource(tst_qmimedatabase-cache "mimetypes" PREFIX "/qt-project.org/qmime/packages" BASE "/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes" FILES - mime/packages/freedesktop.org.xml + ${mimetypes_resource_files} +) +set_source_files_properties("../invalid-magic1.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic1.xml" +) +set_source_files_properties("../invalid-magic2.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic2.xml" +) +set_source_files_properties("../invalid-magic3.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic3.xml" +) +set_source_files_properties("../magic-and-hierarchy.foo" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.foo" +) +set_source_files_properties("../magic-and-hierarchy.xml" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.xml" +) +set_source_files_properties("../magic-and-hierarchy2.foo" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy2.foo" ) set_source_files_properties("../qml-again.xml" - PROPERTIES alias "qml-again.xml" + PROPERTIES QT_RESOURCE_ALIAS "qml-again.xml" ) set_source_files_properties("../test.qml" - PROPERTIES alias "test.qml" + PROPERTIES QT_RESOURCE_ALIAS "test.qml" ) set_source_files_properties("../text-x-objcsrc.xml" - PROPERTIES alias "text-x-objcsrc.xml" + PROPERTIES QT_RESOURCE_ALIAS "text-x-objcsrc.xml" ) set_source_files_properties("../yast2-metapackage-handler-mimetypes.xml" - PROPERTIES alias "yast2-metapackage-handler-mimetypes.xml" + PROPERTIES QT_RESOURCE_ALIAS "yast2-metapackage-handler-mimetypes.xml" ) +set(testdata_resource_files + "invalid-magic1.xml" + "invalid-magic2.xml" + "invalid-magic3.xml" + "magic-and-hierarchy.foo" + "magic-and-hierarchy.xml" + "magic-and-hierarchy2.foo" + "qml-again.xml" + "test.qml" + "text-x-objcsrc.xml" + "yast2-metapackage-handler-mimetypes.xml" +) + add_qt_resource(tst_qmimedatabase-cache "testdata" PREFIX "/qt-project.org/qmime" BASE ".." FILES - invalid-magic1.xml - invalid-magic2.xml - invalid-magic3.xml - magic-and-hierarchy.foo - magic-and-hierarchy.xml - magic-and-hierarchy2.foo - qml-again.xml - test.qml - text-x-objcsrc.xml - yast2-metapackage-handler-mimetypes.xml + ${testdata_resource_files} ) #### Keys ignored in scope 1:.:.:qmimedatabase-cache.pro:: -# CONFIG = "testcase" +# _REQUIREMENTS = "qtConfig(private_tests)" ## Scopes: ##################################################################### -extend_target(tst_qmimedatabase-cache CONDITION 2*_x_ - g +extend_target(tst_qmimedatabase-cache CONDITION GCC COMPILE_OPTIONS -W -Wall diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt index 6bd76e0b9e..7720e4d18e 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt @@ -1,11 +1,14 @@ # Generated from qmimedatabase-cache.pro. +if(NOT QT_FEATURE_private_tests) + return() +endif() + ##################################################################### ## tst_qmimedatabase-cache Test: ##################################################################### add_qt_test(tst_qmimedatabase-cache - GUI SOURCES ../tst_qmimedatabase.h tst_qmimedatabase-cache.cpp @@ -14,6 +17,30 @@ add_qt_test(tst_qmimedatabase-cache ) # Resources: +# special case begin +# the freedesktop resources are handled manually below via mimetypes_resources.cmake +#set(mimetypes_resource_files + #"mime/packages/freedesktop.org.xml" +#) +# special case end +set_source_files_properties("../invalid-magic1.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic1.xml" +) +set_source_files_properties("../invalid-magic2.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic2.xml" +) +set_source_files_properties("../invalid-magic3.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic3.xml" +) +set_source_files_properties("../magic-and-hierarchy.foo" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.foo" +) +set_source_files_properties("../magic-and-hierarchy.xml" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.xml" +) +set_source_files_properties("../magic-and-hierarchy2.foo" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy2.foo" +) set_source_files_properties("../qml-again.xml" PROPERTIES QT_RESOURCE_ALIAS "qml-again.xml" ) @@ -26,22 +53,26 @@ set_source_files_properties("../text-x-objcsrc.xml" set_source_files_properties("../yast2-metapackage-handler-mimetypes.xml" PROPERTIES QT_RESOURCE_ALIAS "yast2-metapackage-handler-mimetypes.xml" ) +set(testdata_resource_files + "invalid-magic1.xml" + "invalid-magic2.xml" + "invalid-magic3.xml" + "magic-and-hierarchy.foo" + "magic-and-hierarchy.xml" + "magic-and-hierarchy2.foo" + "qml-again.xml" + "test.qml" + "text-x-objcsrc.xml" + "yast2-metapackage-handler-mimetypes.xml" +) + add_qt_resource(tst_qmimedatabase-cache "testdata" PREFIX "/qt-project.org/qmime" BASE ".." FILES - invalid-magic1.xml - invalid-magic2.xml - invalid-magic3.xml - magic-and-hierarchy.foo - magic-and-hierarchy.xml - magic-and-hierarchy2.foo - qml-again.xml - test.qml - text-x-objcsrc.xml - yast2-metapackage-handler-mimetypes.xml + ${testdata_resource_files} ) # special case begin @@ -51,13 +82,12 @@ corelib_add_mimetypes_resources(tst_qmimedatabase-cache) # special case end #### Keys ignored in scope 1:.:.:qmimedatabase-cache.pro:: -# CONFIG = "testcase" +# _REQUIREMENTS = "qtConfig(private_tests)" ## Scopes: ##################################################################### -extend_target(tst_qmimedatabase-cache CONDITION CMAKE_COMPILER_IS_GNUCXX - +extend_target(tst_qmimedatabase-cache CONDITION GCC COMPILE_OPTIONS -W -Wall diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt index a33b6c4dcf..009defff8a 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt @@ -1,11 +1,14 @@ # Generated from qmimedatabase-xml.pro. +if(NOT QT_FEATURE_private_tests) + return() +endif() + ##################################################################### ## tst_qmimedatabase-xml Test: ##################################################################### add_qt_test(tst_qmimedatabase-xml - GUI SOURCES ../tst_qmimedatabase.h tst_qmimedatabase-xml.cpp @@ -15,54 +18,80 @@ add_qt_test(tst_qmimedatabase-xml # Resources: set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml" - PROPERTIES alias "freedesktop.org.xml" + PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml" ) +set(mimetypes_resource_files + "mime/packages/freedesktop.org.xml" +) + add_qt_resource(tst_qmimedatabase-xml "mimetypes" PREFIX "/qt-project.org/qmime/packages" BASE "/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes" FILES - mime/packages/freedesktop.org.xml + ${mimetypes_resource_files} +) +set_source_files_properties("../invalid-magic1.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic1.xml" +) +set_source_files_properties("../invalid-magic2.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic2.xml" +) +set_source_files_properties("../invalid-magic3.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic3.xml" +) +set_source_files_properties("../magic-and-hierarchy.foo" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.foo" +) +set_source_files_properties("../magic-and-hierarchy.xml" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.xml" +) +set_source_files_properties("../magic-and-hierarchy2.foo" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy2.foo" ) set_source_files_properties("../qml-again.xml" - PROPERTIES alias "qml-again.xml" + PROPERTIES QT_RESOURCE_ALIAS "qml-again.xml" ) set_source_files_properties("../test.qml" - PROPERTIES alias "test.qml" + PROPERTIES QT_RESOURCE_ALIAS "test.qml" ) set_source_files_properties("../text-x-objcsrc.xml" - PROPERTIES alias "text-x-objcsrc.xml" + PROPERTIES QT_RESOURCE_ALIAS "text-x-objcsrc.xml" ) set_source_files_properties("../yast2-metapackage-handler-mimetypes.xml" - PROPERTIES alias "yast2-metapackage-handler-mimetypes.xml" + PROPERTIES QT_RESOURCE_ALIAS "yast2-metapackage-handler-mimetypes.xml" ) +set(testdata_resource_files + "invalid-magic1.xml" + "invalid-magic2.xml" + "invalid-magic3.xml" + "magic-and-hierarchy.foo" + "magic-and-hierarchy.xml" + "magic-and-hierarchy2.foo" + "qml-again.xml" + "test.qml" + "text-x-objcsrc.xml" + "yast2-metapackage-handler-mimetypes.xml" +) + add_qt_resource(tst_qmimedatabase-xml "testdata" PREFIX "/qt-project.org/qmime" BASE ".." FILES - invalid-magic1.xml - invalid-magic2.xml - invalid-magic3.xml - magic-and-hierarchy.foo - magic-and-hierarchy.xml - magic-and-hierarchy2.foo - qml-again.xml - test.qml - text-x-objcsrc.xml - yast2-metapackage-handler-mimetypes.xml + ${testdata_resource_files} ) #### Keys ignored in scope 1:.:.:qmimedatabase-xml.pro:: -# CONFIG = "testcase" +# _REQUIREMENTS = "qtConfig(private_tests)" ## Scopes: ##################################################################### -extend_target(tst_qmimedatabase-xml CONDITION 2*_x_ - g +extend_target(tst_qmimedatabase-xml CONDITION GCC COMPILE_OPTIONS -W -Wall diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt index d9491fd34b..cf8e349226 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt @@ -1,11 +1,14 @@ # Generated from qmimedatabase-xml.pro. +if(NOT QT_FEATURE_private_tests) + return() +endif() + ##################################################################### ## tst_qmimedatabase-xml Test: ##################################################################### add_qt_test(tst_qmimedatabase-xml - GUI SOURCES ../tst_qmimedatabase.h tst_qmimedatabase-xml.cpp @@ -14,6 +17,30 @@ add_qt_test(tst_qmimedatabase-xml ) # Resources: +# special case begin +# the freedesktop resources are handled manually below via mimetypes_resources.cmake +#set(mimetypes_resource_files + #"mime/packages/freedesktop.org.xml" +#) +# special case end +set_source_files_properties("../invalid-magic1.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic1.xml" +) +set_source_files_properties("../invalid-magic2.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic2.xml" +) +set_source_files_properties("../invalid-magic3.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic3.xml" +) +set_source_files_properties("../magic-and-hierarchy.foo" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.foo" +) +set_source_files_properties("../magic-and-hierarchy.xml" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.xml" +) +set_source_files_properties("../magic-and-hierarchy2.foo" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy2.foo" +) set_source_files_properties("../qml-again.xml" PROPERTIES QT_RESOURCE_ALIAS "qml-again.xml" ) @@ -26,22 +53,26 @@ set_source_files_properties("../text-x-objcsrc.xml" set_source_files_properties("../yast2-metapackage-handler-mimetypes.xml" PROPERTIES QT_RESOURCE_ALIAS "yast2-metapackage-handler-mimetypes.xml" ) +set(testdata_resource_files + "invalid-magic1.xml" + "invalid-magic2.xml" + "invalid-magic3.xml" + "magic-and-hierarchy.foo" + "magic-and-hierarchy.xml" + "magic-and-hierarchy2.foo" + "qml-again.xml" + "test.qml" + "text-x-objcsrc.xml" + "yast2-metapackage-handler-mimetypes.xml" +) + add_qt_resource(tst_qmimedatabase-xml "testdata" PREFIX "/qt-project.org/qmime" BASE ".." FILES - invalid-magic1.xml - invalid-magic2.xml - invalid-magic3.xml - magic-and-hierarchy.foo - magic-and-hierarchy.xml - magic-and-hierarchy2.foo - qml-again.xml - test.qml - text-x-objcsrc.xml - yast2-metapackage-handler-mimetypes.xml + ${testdata_resource_files} ) # special case begin @@ -51,12 +82,12 @@ corelib_add_mimetypes_resources(tst_qmimedatabase-xml) # special case end #### Keys ignored in scope 1:.:.:qmimedatabase-xml.pro:: -# CONFIG = "testcase" +# _REQUIREMENTS = "qtConfig(private_tests)" ## Scopes: ##################################################################### -extend_target(tst_qmimedatabase-xml CONDITION CMAKE_COMPILER_IS_GNUCXX # special case +extend_target(tst_qmimedatabase-xml CONDITION GCC COMPILE_OPTIONS -W -Wall diff --git a/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt index adfcefb917..ef966a6424 100644 --- a/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(tst_qmimetype LIBRARIES Qt::CorePrivate ) - -#### Keys ignored in scope 1:.:.:qmimetype.pro:: -# CONFIG = "testcase"