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/tools/bootstrap | |
| 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/tools/bootstrap')
| -rw-r--r-- | src/tools/bootstrap/.prev_CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/tools/bootstrap/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt index 51553dde99..10f27dc48f 100644 --- a/src/tools/bootstrap/.prev_CMakeLists.txt +++ b/src/tools/bootstrap/.prev_CMakeLists.txt @@ -142,6 +142,7 @@ extend_target(Bootstrap CONDITION WIN32 ../../corelib/kernel/qcoreapplication_win.cpp ../../corelib/kernel/qsharedmemory_win.cpp ../../corelib/kernel/qsystemsemaphore_win.cpp + ../../corelib/kernel/qwinregistry.cpp ../../corelib/plugin/qsystemlibrary.cpp PUBLIC_LIBRARIES advapi32 diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt index 1882b85013..1fc9891b21 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt @@ -147,6 +147,7 @@ extend_target(Bootstrap CONDITION WIN32 ../../corelib/kernel/qcoreapplication_win.cpp ../../corelib/kernel/qsharedmemory_win.cpp ../../corelib/kernel/qsystemsemaphore_win.cpp + ../../corelib/kernel/qwinregistry.cpp ../../corelib/plugin/qsystemlibrary.cpp PUBLIC_LIBRARIES advapi32 |