From ed65d1ab49e6f5537b086178f9f9d14fc190b663 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 23 Sep 2020 11:34:07 +0200 Subject: CMake: Regenerate projects to use new qt_internal_ API Modify special case locations to use the new API as well. Task-number: QTBUG-86815 Change-Id: I4a690095fcd4b1141550de86b6820ae2dd579429 Reviewed-by: Cristian Adam --- tests/auto/styleimports/.prev_CMakeLists.txt | 8 ++++---- tests/auto/styleimports/CMakeLists.txt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/auto/styleimports') diff --git a/tests/auto/styleimports/.prev_CMakeLists.txt b/tests/auto/styleimports/.prev_CMakeLists.txt index 108a2054..4d614767 100644 --- a/tests/auto/styleimports/.prev_CMakeLists.txt +++ b/tests/auto/styleimports/.prev_CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_styleimports +qt_internal_add_test(tst_styleimports SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -38,7 +38,7 @@ set(qmake_resourcestyle_resource_files "resources/ResourceStyle/qmldir" ) -qt_add_resource(tst_styleimports "qmake_resourcestyle" +qt_internal_add_resource(tst_styleimports "qmake_resourcestyle" PREFIX "/" BASE @@ -54,12 +54,12 @@ qt_add_resource(tst_styleimports "qmake_resourcestyle" ## Scopes: ##################################################################### -qt_extend_target(tst_styleimports CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_styleimports CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_styleimports CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_styleimports CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/styleimports/CMakeLists.txt b/tests/auto/styleimports/CMakeLists.txt index 27ba24e7..94e7bce8 100644 --- a/tests/auto/styleimports/CMakeLists.txt +++ b/tests/auto/styleimports/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_styleimports +qt_internal_add_test(tst_styleimports SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -38,7 +38,7 @@ set(qmake_resourcestyle_resource_files "ResourceStyle/qmldir" # special case ) -qt_add_resource(tst_styleimports "qmake_resourcestyle" +qt_internal_add_resource(tst_styleimports "qmake_resourcestyle" PREFIX "/" BASE @@ -54,12 +54,12 @@ qt_add_resource(tst_styleimports "qmake_resourcestyle" ## Scopes: ##################################################################### -qt_extend_target(tst_styleimports CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_styleimports CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_styleimports CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_styleimports CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) -- cgit v1.2.3