summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/kernel/qmetatype
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/corelib/kernel/qmetatype')
-rw-r--r--tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt38
-rw-r--r--tests/auto/corelib/kernel/qmetatype/CMakeLists.txt6
2 files changed, 3 insertions, 41 deletions
diff --git a/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt
deleted file mode 100644
index 16188d2d33..0000000000
--- a/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-# Generated from qmetatype.pro.
-
-#####################################################################
-## tst_qmetatype Test:
-#####################################################################
-
-# Collect test data
-list(APPEND test_data "./typeFlags.bin")
-
-qt_add_test(tst_qmetatype
- SOURCES
- tst_qmetatype.cpp
- DEFINES
- QT_DISABLE_DEPRECATED_BEFORE=0
- INCLUDE_DIRECTORIES
- ../../../other/qvariant_common
- PUBLIC_LIBRARIES
- Qt::CorePrivate
- Qt::Gui
- TESTDATA ${test_data}
-)
-
-## Scopes:
-#####################################################################
-
-qt_extend_target(tst_qmetatype CONDITION MSVC
- COMPILE_OPTIONS
- /bigobj
-)
-
-#### Keys ignored in scope 3:.:.:qmetatype.pro:CLANG:
-# QMAKE_CFLAGS_RELEASE = "--O2" "--g"
-# QMAKE_CXXFLAGS_RELEASE = "--O2" "--g"
-
-qt_extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm")
- DEFINES
- TST_QMETATYPE_BROKEN_COMPILER
-)
diff --git a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
index 16188d2d33..d3e576127f 100644
--- a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
@@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "./typeFlags.bin")
-qt_add_test(tst_qmetatype
+qt_internal_add_test(tst_qmetatype
SOURCES
tst_qmetatype.cpp
DEFINES
@@ -23,7 +23,7 @@ qt_add_test(tst_qmetatype
## Scopes:
#####################################################################
-qt_extend_target(tst_qmetatype CONDITION MSVC
+qt_internal_extend_target(tst_qmetatype CONDITION MSVC
COMPILE_OPTIONS
/bigobj
)
@@ -32,7 +32,7 @@ qt_extend_target(tst_qmetatype CONDITION MSVC
# QMAKE_CFLAGS_RELEASE = "--O2" "--g"
# QMAKE_CXXFLAGS_RELEASE = "--O2" "--g"
-qt_extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm")
+qt_internal_extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm")
DEFINES
TST_QMETATYPE_BROKEN_COMPILER
)