From 48c82e90af12da74c713665ddfd7f8d825ae5bdb Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Thu, 16 Jan 2020 10:42:05 +0100 Subject: Post Merge Fixes Change-Id: I1e06c01b76b119c3f23b6e6ecbaae8df719b70ce Reviewed-by: Alexandru Croitor --- .../mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt | 4 ++-- .../mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/auto/corelib/mimetypes') 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 ced7f27a19..9dc2ea18bf 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 @@ add_qt_test(tst_qmimedatabase-cache ) # Resources: -set_source_files_properties("/devel/qt5/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml" +set_source_files_properties("/devel/work/qt-cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml" PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml" ) set(mimetypes_resource_files @@ -28,7 +28,7 @@ add_qt_resource(tst_qmimedatabase-cache "mimetypes" PREFIX "/qt-project.org/qmime/packages" BASE - "/devel/qt5/qtbase/src/corelib/mimetypes" + "/devel/work/qt-cmake/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 7f34b06fab..1672255d29 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 @@ add_qt_test(tst_qmimedatabase-xml ) # Resources: -set_source_files_properties("/devel/qt5/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml" +set_source_files_properties("/devel/work/qt-cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml" PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml" ) set(mimetypes_resource_files @@ -28,7 +28,7 @@ add_qt_resource(tst_qmimedatabase-xml "mimetypes" PREFIX "/qt-project.org/qmime/packages" BASE - "/devel/qt5/qtbase/src/corelib/mimetypes" + "/devel/work/qt-cmake/qtbase/src/corelib/mimetypes" FILES ${mimetypes_resource_files} ) -- cgit v1.2.3