diff options
author | Liang Qi <liang.qi@qt.io> | 2018-11-19 12:42:10 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-11-19 12:42:10 +0100 |
commit | 4d180586cddbd71a67c83246db3bec1caa595e05 (patch) | |
tree | 0970def686b4e28e9cf6a3f0fc897e05bb0a9fbc /src/gui | |
parent | 6b088b7a1da37511a8abb1503e4f2f95632dbdac (diff) | |
parent | 527406cbd99f44470ef87468b73c18df949e8ac7 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
Change-Id: I66a08c770767a93cd26535689e3e7806486aab06
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/image/qiconloader.cpp | 6 | ||||
-rw-r--r-- | src/gui/kernel/qplatformdialoghelper.cpp | 6 | ||||
-rw-r--r-- | src/gui/kernel/qplatforminputcontextfactory.cpp | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp index 228de3adc3..a9adde8c8d 100644 --- a/src/gui/image/qiconloader.cpp +++ b/src/gui/image/qiconloader.cpp @@ -50,7 +50,9 @@ #include <QtCore/qmath.h> #include <QtCore/QList> #include <QtCore/QDir> +#if QT_CONFIG(settings) #include <QtCore/QSettings> +#endif #include <QtGui/QPainter> #include <private/qhexstring_p.h> @@ -348,7 +350,7 @@ QIconTheme::QIconTheme(const QString &themeName) m_valid = true; } } -#ifndef QT_NO_SETTINGS +#if QT_CONFIG(settings) if (themeIndex.exists()) { const QSettings indexReader(themeIndex.fileName(), QSettings::IniFormat); const QStringList keys = indexReader.allKeys(); @@ -407,7 +409,7 @@ QIconTheme::QIconTheme(const QString &themeName) if (!m_parents.contains(QLatin1String("hicolor"))) m_parents.append(QLatin1String("hicolor")); } -#endif //QT_NO_SETTINGS +#endif // settings } QThemeIconInfo QIconLoader::findIconHelper(const QString &themeName, diff --git a/src/gui/kernel/qplatformdialoghelper.cpp b/src/gui/kernel/qplatformdialoghelper.cpp index b787629f6a..628ad06478 100644 --- a/src/gui/kernel/qplatformdialoghelper.cpp +++ b/src/gui/kernel/qplatformdialoghelper.cpp @@ -42,7 +42,9 @@ #include <QtCore/QCoreApplication> #include <QtCore/QVariant> #include <QtCore/QSharedData> +#if QT_CONFIG(settings) #include <QtCore/QSettings> +#endif #include <QtCore/QUrl> #include <QtCore/QVector> #include <QtGui/QColor> @@ -284,7 +286,7 @@ QColorDialogStaticData::QColorDialogStaticData() : customSet(false) void QColorDialogStaticData::readSettings() { -#ifndef QT_NO_SETTINGS +#if QT_CONFIG(settings) const QSettings settings(QSettings::UserScope, QStringLiteral("QtProject")); for (int i = 0; i < int(CustomColorCount); ++i) { const QVariant v = settings.value(QLatin1String("Qt/customColors/") + QString::number(i)); @@ -296,7 +298,7 @@ void QColorDialogStaticData::readSettings() void QColorDialogStaticData::writeSettings() const { -#ifndef QT_NO_SETTINGS +#if QT_CONFIG(settings) if (customSet) { const_cast<QColorDialogStaticData*>(this)->customSet = false; QSettings settings(QSettings::UserScope, QStringLiteral("QtProject")); diff --git a/src/gui/kernel/qplatforminputcontextfactory.cpp b/src/gui/kernel/qplatforminputcontextfactory.cpp index c59d89fabe..df7b95d8df 100644 --- a/src/gui/kernel/qplatforminputcontextfactory.cpp +++ b/src/gui/kernel/qplatforminputcontextfactory.cpp @@ -48,14 +48,14 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_SETTINGS +#if QT_CONFIG(settings) Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QPlatformInputContextFactoryInterface_iid, QLatin1String("/platforminputcontexts"), Qt::CaseInsensitive)) #endif QStringList QPlatformInputContextFactory::keys() { -#ifndef QT_NO_SETTINGS +#if QT_CONFIG(settings) return loader()->keyMap().values(); #else return QStringList(); @@ -70,7 +70,7 @@ QString QPlatformInputContextFactory::requested() QPlatformInputContext *QPlatformInputContextFactory::create(const QString& key) { -#ifndef QT_NO_SETTINGS +#if QT_CONFIG(settings) if (!key.isEmpty()) { QStringList paramList = key.split(QLatin1Char(':')); const QString platform = paramList.takeFirst().toLower(); |