diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-12-09 14:59:40 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-12-10 11:52:30 +0100 |
commit | 2304acab5ff3bd3832c2e388cfdab27f2a95caa8 (patch) | |
tree | 836fda9d762ec9c4f8461804f1e2d22cdf16303f /tests/auto/corelib/mimetypes | |
parent | b94b7687b0635ee74a3ccd83a234ead0600fd47f (diff) |
CMake: Regenerate projects using pro2cmake one last time
And fix up some wrong qmake project files
Pick-to: 6.0
Change-Id: I66cb82aeb9c1419a74df1a650fa78a511ade7443
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/corelib/mimetypes')
-rw-r--r-- | tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 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 b3c0879605..31ee565109 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_qmimedatabase-cache ) # Resources: -set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml" +set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/worktrees/dev/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml" PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml" ) set(mimetypes_resource_files @@ -28,7 +28,7 @@ qt_internal_add_resource(tst_qmimedatabase-cache "mimetypes" PREFIX "/qt-project.org/qmime/packages" BASE - "/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes" + "/Volumes/T3/Dev/qt/qt5_cmake/worktrees/dev/qtbase/src/corelib/mimetypes" FILES ${mimetypes_resource_files} ) 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 b1cabd0b7e..66d6e8414c 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_qmimedatabase-xml ) # Resources: -set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml" +set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/worktrees/dev/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml" PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml" ) set(mimetypes_resource_files @@ -28,7 +28,7 @@ qt_internal_add_resource(tst_qmimedatabase-xml "mimetypes" PREFIX "/qt-project.org/qmime/packages" BASE - "/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes" + "/Volumes/T3/Dev/qt/qt5_cmake/worktrees/dev/qtbase/src/corelib/mimetypes" FILES ${mimetypes_resource_files} ) |