summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-01-22 13:01:06 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2021-01-22 19:22:15 +0100
commit88e24e6a25479e3d177a6ffcade1ca624a2fac39 (patch)
treed3e71c49a31cf83feb640d33ffa58818e299e08a /src
parenta0aaa4ae2e904e62a700ee6b6b73340498df2380 (diff)
Remove the QT_CMAKE_BUILD preprocessor define
Qt is now always built with CMake. The "cmake" keyword for QtTest blacklists remains for now. Removal is tracked in QTBUG-90545. Change-Id: I0011d56176a07c82698b2eb9aa330e77efa6cd34 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/testlib/CMakeLists.txt3
-rw-r--r--src/testlib/qtestblacklist.cpp2
2 files changed, 0 insertions, 5 deletions
diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt
index 718c792dcc..35f824af49 100644
--- a/src/testlib/CMakeLists.txt
+++ b/src/testlib/CMakeLists.txt
@@ -132,7 +132,4 @@ qt_internal_add_docs(Test
# special case begin
qt_internal_apply_testlib_coverage_options(Test)
-
-# Allow blacklisting tests depending on whether testlib was built as part of a CMake build.
-target_compile_definitions(Test PRIVATE QT_CMAKE_BUILD)
# special case end
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp
index b9d174bbe0..78eba7b8be 100644
--- a/src/testlib/qtestblacklist.cpp
+++ b/src/testlib/qtestblacklist.cpp
@@ -184,9 +184,7 @@ static QSet<QByteArray> keywords()
<< "developer-build"
#endif
-#ifdef QT_CMAKE_BUILD
<< "cmake"
-#endif
;
#if QT_CONFIG(properties)