AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the QT_CMAKE_BUILD preprocessor define

Browse Source 
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:
Joerg Bornemann 2021-01-22 13:01:06 +01:00
parent a0aaa4ae2e
commit 88e24e6a25
4 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/testlib/CMakeLists.txt
View File

@ -132,7 +132,4 @@ qt_internal_add_docs(Test
# special case begin # special case begin
qt_internal_apply_testlib_coverage_options(Test) 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 # special case end

2
src/testlib/qtestblacklist.cpp
View File

@ -184,9 +184,7 @@ static QSet<QByteArray> keywords()
<< "developer-build" << "developer-build"
#endif #endif
#ifdef QT_CMAKE_BUILD
<< "cmake" << "cmake"
#endif
; ;
#if QT_CONFIG(properties) #if QT_CONFIG(properties)

2
tests/auto/corelib/global/qlogging/CMakeLists.txt
View File

@ -22,8 +22,6 @@ qt_internal_add_test(tst_qlogging SOURCES tst_qlogging.cpp
HELPER_BINARY="${CMAKE_CURRENT_BINARY_DIR}/qlogging_helper" 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 qt_internal_add_test(tst_qmessagelogger SOURCES tst_qmessagelogger.cpp
DEFINES DEFINES
QT_MESSAGELOGCONTEXT QT_MESSAGELOGCONTEXT

4
tests/auto/corelib/global/qlogging/tst_qlogging.cpp
View File

@ -737,11 +737,7 @@ void tst_qmessagehandler::qMessagePattern_data()
QTest::newRow("time-process") << "<%{time process}>%{message}" << true << (QList<QByteArray>() QTest::newRow("time-process") << "<%{time process}>%{message}" << true << (QList<QByteArray>()
<< "< "); << "< ");
#ifdef QT_CMAKE_BUILD
#define BACKTRACE_HELPER_NAME "qlogging_helper" #define BACKTRACE_HELPER_NAME "qlogging_helper"
#else
#define BACKTRACE_HELPER_NAME "helper"
#endif
#ifdef __GLIBC__ #ifdef __GLIBC__
#ifdef QT_NAMESPACE #ifdef QT_NAMESPACE