diff options
author | Alexey Edelev <alexey.edelev@qt.io> | 2021-01-28 16:06:26 +0100 |
---|---|---|
committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-02-25 16:08:43 +0100 |
commit | 43c28aa9046967abeb4ad042c8be1aa23a19c282 (patch) | |
tree | b8f4a53cd9aaaa819c853ee51e66ea100c1ae3d5 /src/corelib/io/qsettings.cpp | |
parent | 5a3bbb55851b84aa6a46c23e5a6fb33b4860edc6 (diff) |
Use Core library for qmake instead of the Bootstrap library
Move the qmake-specific logic of the QLibraryInfo class to
qmake internals. 'qconfig.cpp.in' now stores information about
the library info entries to keep them consistent between qmake
and the Core library. qmake requires specific features enabled
in the Core library, so building qmake will be skipped if the
features are not enabled.
All flags directly related to the qmake have been removed from
Core lib.
Remove all bootstrap related sections from qmake CMakeLists.txt
Task-number: QTBUG-89369
Change-Id: I26de157d3bfd4a5526699296e9d46e1c180b89ae
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/corelib/io/qsettings.cpp')
-rw-r--r-- | src/corelib/io/qsettings.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 7f16a82199..97e3bf884b 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -60,9 +60,7 @@ #include "qrect.h" #endif // !QT_NO_GEOM_VARIANT -#ifndef QT_BUILD_QMAKE -# include "qcoreapplication.h" -#endif +#include "qcoreapplication.h" #ifndef QT_BOOTSTRAPPED #include "qsavefile.h" @@ -2661,7 +2659,6 @@ QSettings::QSettings(const QString &fileName, Format format) d_ptr->q_ptr = this; } -# ifndef QT_BUILD_QMAKE QSettings::QSettings(Scope scope) : d_ptr(QSettingsPrivate::create(globalDefaultFormat, scope, # ifdef Q_OS_DARWIN @@ -2678,7 +2675,6 @@ QSettings::QSettings(Scope scope) { d_ptr->q_ptr = this; } -# endif #endif /*! |