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>
This commit is contained in:
parent
a0aaa4ae2e
commit
88e24e6a25
@ -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
|
||||
|
@ -184,9 +184,7 @@ static QSet<QByteArray> keywords()
|
||||
<< "developer-build"
|
||||
#endif
|
||||
|
||||
#ifdef QT_CMAKE_BUILD
|
||||
<< "cmake"
|
||||
#endif
|
||||
;
|
||||
|
||||
#if QT_CONFIG(properties)
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user