diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-11 11:01:13 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-11 19:36:26 +0000 |
| commit | 1410cc24cce10f9711a98d5a2755ebdea750dd61 (patch) | |
| tree | dc9afc1773ae856123dc8f4b1035ab58574fbc73 /src | |
| parent | 08ed9ad137d903246f2aff5b29bb3478e3feeb5e (diff) | |
Regenerate src/corelib
Change-Id: Ibb69cad45169546fa97ee06881868cdbb082e9d6
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/.prev_CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/corelib/CMakeLists.txt | 11 |
2 files changed, 13 insertions, 6 deletions
diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt index 13f0ad9975..7d94c11c57 100644 --- a/src/corelib/.prev_CMakeLists.txt +++ b/src/corelib/.prev_CMakeLists.txt @@ -232,6 +232,10 @@ add_qt_module(Core LIBRARIES ZLIB::ZLIB doubleconversion + PRECOMPILED_HEADER + "global/qt_pch.h" + NO_PCH_SOURCES + "text/qstring_compat.cpp" ) add_qt_simd_part(Core SIMD mips_dsp SOURCES @@ -429,7 +433,7 @@ extend_target(Core CONDITION _ss_f16c_cxx #### Keys ignored in scope 27:.:global:global/global.pri:else: # F16C_SOURCES = "global/qfloat16_f16c.c" -extend_target(Core CONDITION linux_x_ OR hurd_x_ AND NOT cross_compile AND NOT static AND NOT _x_-armcc_x_ +extend_target(Core CONDITION linux_x_ OR (hurd_x_ AND NOT _x_-armcc_x_ AND NOT cross_compile AND NOT static) DEFINES ELF_INTERPRETER=\\\"=Creadelf-l/bin/ls|perl-n-e\'['quote', ['if', ['/program', 'interpreter:', ['.*'], ']/'], '{', 'print', '$1;', '}']]\'\\\" LINK_OPTIONS @@ -565,6 +569,8 @@ extend_target(Core CONDITION ICC extend_target(Core CONDITION MSVC SOURCES tools/qvector_msvc.cpp + NO_PCH_SOURCES + "tools/qvector_msvc.cpp" ) extend_target(Core CONDITION QT_FEATURE_commandlineparser diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 47ba9ce7fc..b9aa03a496 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -239,6 +239,10 @@ add_qt_module(Core INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/global # special case # special case: remove ../3rdparty/... + PRECOMPILED_HEADER + global/qt_pch.h + NO_PCH_SOURCES + text/qstring_compat.cpp LIBRARIES ZLIB::ZLIB # double-conversion # special case @@ -250,11 +254,6 @@ add_qt_module(Core PUBLIC_LIBRARIES # special case: Qt::Platform # special case: DISABLE_TOOLS_EXPORT # special case: - PRECOMPILED_HEADER - global/qt_pch.h - NO_PCH_SOURCES - text/qstring_compat.cpp - tools/qvector_msvc.cpp # special case begin # Generated in QtBaseGlobalTargets EXTRA_CMAKE_FILES ${QT_CORE_RESOURCE_GENERATED_FILE_PATH} @@ -656,6 +655,8 @@ extend_target(Core CONDITION ICC extend_target(Core CONDITION MSVC SOURCES tools/qvector_msvc.cpp + NO_PCH_SOURCES + "tools/qvector_msvc.cpp" ) extend_target(Core CONDITION QT_FEATURE_commandlineparser |