diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-29 17:58:03 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-29 23:22:35 +0200 |
| commit | c67c05ee0e2dc8c2132402869aa19ac29fa1f104 (patch) | |
| tree | 239571917fc196709db88a209d324b2fa4fe8f80 /src/corelib | |
| parent | 41b1eaf5790a502401f1744d2b9de045894d1235 (diff) | |
CMake: Regenerate src/corelib
Change-Id: I985f9cca78e173f066d65e704c101d499668163a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/.prev_CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/corelib/CMakeLists.txt | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt index 15b76decd5..51bb15fc3c 100644 --- a/src/corelib/.prev_CMakeLists.txt +++ b/src/corelib/.prev_CMakeLists.txt @@ -152,6 +152,7 @@ qt_add_module(Core text/qstring_compat.cpp text/qstringalgorithms.h text/qstringalgorithms_p.h text/qstringbuilder.cpp text/qstringbuilder.h + text/qstringconverter.cpp text/qstringconverter.h text/qstringconverter_p.h text/qstringiterator_p.h text/qstringlist.cpp text/qstringlist.h text/qstringliteral.h @@ -573,7 +574,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_future qt_extend_target(Core CONDITION QT_FEATURE_std_atomic64 PUBLIC_LIBRARIES - Atomic + WrapAtomic::WrapAtomic ) qt_extend_target(Core CONDITION ICC @@ -972,7 +973,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_glib AND UNIX qt_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX LIBRARIES - WrapRt + WrapRt::WrapRt ) qt_extend_target(Core CONDITION UNIX AND NOT ANDROID diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 710d025caf..62cf6ec1bb 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -169,8 +169,8 @@ qt_add_module(Core text/qstring.cpp text/qstring.h text/qstring_compat.cpp text/qstringalgorithms.h text/qstringalgorithms_p.h - text/qstringconverter.cpp text/qstringconverter.h text/qstringconverter_p.h text/qstringbuilder.cpp text/qstringbuilder.h + text/qstringconverter.cpp text/qstringconverter.h text/qstringconverter_p.h text/qstringiterator_p.h text/qstringlist.cpp text/qstringlist.h text/qstringliteral.h @@ -248,7 +248,7 @@ qt_add_module(Core # ../3rdparty/sha3 # special case remove ../3rdparty/tinycbor/src PRECOMPILED_HEADER - global/qt_pch.h + "global/qt_pch.h" NO_PCH_SOURCES "text/qstring_compat.cpp" LIBRARIES |