summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-03-05 11:19:16 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2021-03-11 09:59:27 +0100
commit17055f5f4833ba96f7d361c7113a88d973a0e186 (patch)
tree56ecb4092d9d4cbb30c9a21659e5e03a2decac71
parent2a9c93a3483e60257d2625b70b395cc20dcc88ce (diff)
Remove the platformsSection constant from qconfig.cpp.in
This is not configurable and doesn't have to be in the generated q[make]config.cpp files. Change-Id: If294d735800a3b5c6b3e269abdd86df401cf4864 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--qmake/qmakelibraryinfo.cpp2
-rw-r--r--src/corelib/global/qconfig.cpp.in2
-rw-r--r--src/corelib/global/qlibraryinfo.cpp4
3 files changed, 3 insertions, 5 deletions
diff --git a/qmake/qmakelibraryinfo.cpp b/qmake/qmakelibraryinfo.cpp
index e8bb70071e..c118725d27 100644
--- a/qmake/qmakelibraryinfo.cpp
+++ b/qmake/qmakelibraryinfo.cpp
@@ -110,7 +110,7 @@ void QMakeLibrarySettings::load()
haveEffectiveSourcePaths || children.contains(QLatin1String("EffectivePaths"));
// Backwards compat: an existing but empty file is claimed to contain the Paths section.
havePaths = (!haveDevicePaths && !haveEffectivePaths
- && !children.contains(QLatin1String(platformsSection)))
+ && !children.contains(QLatin1String("Platforms")))
|| children.contains(QLatin1String("Paths"));
} else {
haveDevicePaths = false;
diff --git a/src/corelib/global/qconfig.cpp.in b/src/corelib/global/qconfig.cpp.in
index b529e19830..0eced515cf 100644
--- a/src/corelib/global/qconfig.cpp.in
+++ b/src/corelib/global/qconfig.cpp.in
@@ -98,5 +98,3 @@ static const struct {
{ "HostPrefix", "" },
#endif
};
-
-static const char platformsSection[] = "Platforms";
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index b48b1b5d95..f6c755b750 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -122,7 +122,7 @@ void QLibrarySettings::load()
haveEffectivePaths = haveEffectiveSourcePaths || children.contains(QLatin1String("EffectivePaths"));
// Backwards compat: an existing but empty file is claimed to contain the Paths section.
havePaths = (!haveDevicePaths && !haveEffectivePaths
- && !children.contains(QLatin1String(platformsSection)))
+ && !children.contains(QLatin1String("Platforms")))
|| children.contains(QLatin1String("Paths"));
if (!havePaths)
settings.reset(nullptr);
@@ -594,7 +594,7 @@ QStringList QLibraryInfo::platformPluginArguments(const QString &platformName)
#if QT_CONFIG(settings)
QScopedPointer<const QSettings> settings(QLibraryInfoPrivate::findConfiguration());
if (!settings.isNull()) {
- const QString key = QLatin1String(platformsSection)
+ const QString key = QLatin1String("Platforms")
+ QLatin1Char('/')
+ platformName
+ QLatin1String("Arguments");