diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-08-18 09:16:40 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-08-21 08:29:37 +0200 |
| commit | 4906b43b0055aef027a43044c22374a5fc31df44 (patch) | |
| tree | 68e3641d8d37f3f34ea5b09c7a4047c832b7ee89 /src/tools | |
| parent | 48c5780d5f804fb001525438ef576f61897b196f (diff) | |
QCoreGlobalData: remove
Inline the data members into the only remaining user (qdir.cpp) and
remove the class.
As a drive-by, fix the non-idiomatic use of QT_BUILD_CORE_LIB to mean
!QT_BOOTSTRAPPED and apply the guard consistently to the declaration,
too.
Pick-to: 6.4 6.3 6.2
Fixes: QTBUG-105747
Change-Id: If2c780dd96e2a2e331cabdc42fd920874e7737b0
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/bootstrap/CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt index cac8689be3..4f0e1680bb 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt @@ -44,7 +44,6 @@ qt_internal_extend_target(Bootstrap ../../corelib/io/qstandardpaths.cpp ../../corelib/io/qtemporaryfile.cpp ../../corelib/kernel/qcoreapplication.cpp - ../../corelib/kernel/qcoreglobaldata.cpp ../../corelib/kernel/qiterable.cpp ../../corelib/kernel/qmetacontainer.cpp ../../corelib/kernel/qmetatype.cpp |