From 4906b43b0055aef027a43044c22374a5fc31df44 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 18 Aug 2022 09:16:40 +0200 Subject: QCoreGlobalData: remove MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Qt CI Bot --- src/tools/bootstrap/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'src/tools/bootstrap') 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 -- cgit v1.2.3