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>
This commit is contained in:
parent
2a9c93a348
commit
17055f5f48
@ -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;
|
||||
|
@ -98,5 +98,3 @@ static const struct {
|
||||
{ "HostPrefix", "" },
|
||||
#endif
|
||||
};
|
||||
|
||||
static const char platformsSection[] = "Platforms";
|
||||
|
@ -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");
|
||||
|
Loading…
Reference in New Issue
Block a user