diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-01-22 13:01:06 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-01-22 19:22:15 +0100 |
| commit | 88e24e6a25479e3d177a6ffcade1ca624a2fac39 (patch) | |
| tree | d3e71c49a31cf83feb640d33ffa58818e299e08a | |
| parent | a0aaa4ae2e904e62a700ee6b6b73340498df2380 (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>
| -rw-r--r-- | src/testlib/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/testlib/qtestblacklist.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/global/qlogging/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/global/qlogging/tst_qlogging.cpp | 4 |
4 files changed, 0 insertions, 11 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) diff --git a/tests/auto/corelib/global/qlogging/CMakeLists.txt b/tests/auto/corelib/global/qlogging/CMakeLists.txt index feeffd4fc5..a9950d3414 100644 --- a/tests/auto/corelib/global/qlogging/CMakeLists.txt +++ b/tests/auto/corelib/global/qlogging/CMakeLists.txt @@ -22,8 +22,6 @@ qt_internal_add_test(tst_qlogging SOURCES tst_qlogging.cpp HELPER_BINARY="${CMAKE_CURRENT_BINARY_DIR}/qlogging_helper" ) -target_compile_definitions(tst_qlogging PRIVATE QT_CMAKE_BUILD) # to fix the binary name - qt_internal_add_test(tst_qmessagelogger SOURCES tst_qmessagelogger.cpp DEFINES QT_MESSAGELOGCONTEXT diff --git a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp index 82bdfdb28a..7667cb278e 100644 --- a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp +++ b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp @@ -737,11 +737,7 @@ void tst_qmessagehandler::qMessagePattern_data() QTest::newRow("time-process") << "<%{time process}>%{message}" << true << (QList<QByteArray>() << "< "); -#ifdef QT_CMAKE_BUILD #define BACKTRACE_HELPER_NAME "qlogging_helper" -#else -#define BACKTRACE_HELPER_NAME "helper" -#endif #ifdef __GLIBC__ #ifdef QT_NAMESPACE |