diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-17 10:02:48 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-17 16:56:23 +0000 |
| commit | 4df389eb4f1ae10284c03023e923ce2164d46753 (patch) | |
| tree | 0bf380793f86b06cc92c3dcb12d858e199c7cd7d /src/corelib/CMakeLists.txt | |
| parent | 02164e0288f714f1ea93afb32548548686773d1d (diff) | |
Re-generate affected cmake files and configure.json after the merge
This also removes the workarounds of commit
b2662b05dd078c46b82f5f041f51b0b83554113d now that it's fixed "upstream"
in the .pro files.
Change-Id: Idd5e6273873a700fcda5a6cad2039c4e88b61f6f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/corelib/CMakeLists.txt')
| -rw-r--r-- | src/corelib/CMakeLists.txt | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 48afa3c502..82e05c690d 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -135,7 +135,6 @@ add_qt_module(Core serialization/qcborcommon.h serialization/qcbordiagnostic.cpp serialization/qcbormap.h - serialization/qcborstream.cpp serialization/qcborstream.h serialization/qcborvalue.cpp serialization/qcborvalue.h serialization/qcborvalue_p.h serialization/qdatastream.cpp serialization/qdatastream.h serialization/qdatastream_p.h serialization/qjson.cpp serialization/qjson_p.h @@ -447,6 +446,7 @@ extend_target(Core CONDITION WIN32 AND NOT WINRT io/qwindowspipereader.cpp io/qwindowspipereader_p.h io/qwindowspipewriter.cpp io/qwindowspipewriter_p.h kernel/qeventdispatcher_win.cpp kernel/qeventdispatcher_win_p.h + kernel/qwinregistry.cpp kernel/qwinregistry_p.h LIBRARIES advapi32 kernel32 @@ -1071,6 +1071,11 @@ extend_target(Core CONDITION QT_FEATURE_textcodec AND WIN32 AND NOT QT_FEATURE_i codecs/qwindowscodec.cpp codecs/qwindowscodec_p.h ) +extend_target(Core CONDITION QT_FEATURE_cborstream + SOURCES + serialization/qcborstream.cpp serialization/qcborstream.h +) + extend_target(Core CONDITION QT_FEATURE_qeventtransition SOURCES statemachine/qeventtransition.cpp statemachine/qeventtransition.h statemachine/qeventtransition_p.h @@ -1092,8 +1097,10 @@ extend_target(Core CONDITION QT_FEATURE_mimetype # We can't specify the resources directly as we have unit tests that # depend on these as well and we no longer support the use of hand # edited qrc files. -include(${CMAKE_CURRENT_SOURCE_DIR}/mimetypes/mimetypes_resources.cmake) -corelib_add_mimetypes_resources(Core) +if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database) + include(${CMAKE_CURRENT_SOURCE_DIR}/mimetypes/mimetypes_resources.cmake) + corelib_add_mimetypes_resources(Core) +endif() # special case end extend_target(Core CONDITION WASM |