diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-05-28 16:41:49 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-03 15:14:42 +0200 |
| commit | e4079eca49adce16e31dac2a18d49d7a55817891 (patch) | |
| tree | 1dfb960ec1115b1f552afe8a013058542389505e /src/corelib/.prev_CMakeLists.txt | |
| parent | f32a6cfb6b6236533508901f114ab57396da8ff3 (diff) | |
| parent | ec6dc5f78453048c4f0604655a34c6c20c79d819 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Take 5.
Change-Id: Ifb2d20e95ba824e45e667fba6c2ba45389991cc3
Diffstat (limited to 'src/corelib/.prev_CMakeLists.txt')
| -rw-r--r-- | src/corelib/.prev_CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt index 13b2a44457..0b0f9632e3 100644 --- a/src/corelib/.prev_CMakeLists.txt +++ b/src/corelib/.prev_CMakeLists.txt @@ -30,6 +30,7 @@ add_qt_module(Core global/qlibraryinfo.cpp global/qlibraryinfo.h global/qlogging.cpp global/qlogging.h global/qmalloc.cpp + global/qmemory_p.h global/qnamespace.h global/qnumeric.cpp global/qnumeric.h global/qnumeric_p.h global/qoperatingsystemversion.cpp global/qoperatingsystemversion.h global/qoperatingsystemversion_p.h @@ -160,6 +161,7 @@ add_qt_module(Core tools/qchar.h tools/qcollator.cpp tools/qcollator.h tools/qcollator_p.h tools/qcontainerfwd.h + tools/qcontainertools_impl.h tools/qcontiguouscache.cpp tools/qcontiguouscache.h tools/qcryptographichash.cpp tools/qcryptographichash.h tools/qdatetime.cpp tools/qdatetime.h tools/qdatetime_p.h @@ -336,6 +338,7 @@ extend_target(Core CONDITION WIN32 AND NOT WINRT LIBRARIES advapi32 kernel32 + netapi32 ole32 shell32 user32 @@ -344,7 +347,6 @@ extend_target(Core CONDITION WIN32 AND NOT WINRT winmm PUBLIC_LIBRARIES mpr - netapi32 userenv ) |