whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Alexandru Croitor 2019-09-11 11:01:13 +02:00
parent 08ed9ad137
commit 1410cc24cc
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/.prev_CMakeLists.txt
View File

@ -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

11
src/corelib/CMakeLists.txt
View File

@ -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