diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-01-31 12:58:32 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-01-31 12:47:18 +0000 |
| commit | 283e95aaf299b6bb320dbacabb099d91f070f116 (patch) | |
| tree | 725b304bafed6ba861523e65c42934a87b2650d0 | |
| parent | db55ad70edccf9041918a99f982a55db7136d5ab (diff) | |
Fix build with -no-feature-settings
Change-Id: I204c50539288df16c4d4010e91c8ecc60f202ec6
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| -rw-r--r-- | src/imports/controls/material/qquickmaterialstyle.cpp | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/qquickuniversalstyle.cpp | 2 | ||||
| -rw-r--r-- | src/quickcontrols2/qquickstyle.cpp | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp index 788c0cf2..eeadb5f3 100644 --- a/src/imports/controls/material/qquickmaterialstyle.cpp +++ b/src/imports/controls/material/qquickmaterialstyle.cpp @@ -1160,8 +1160,10 @@ static Enum toEnumValue(const QByteArray &value, bool *ok) static QByteArray resolveSetting(const QByteArray &env, const QSharedPointer<QSettings> &settings, const QString &name) { QByteArray value = qgetenv(env); +#if QT_CONFIG(settings) if (value.isNull() && !settings.isNull()) value = settings->value(name).toByteArray(); +#endif return value; } diff --git a/src/imports/controls/universal/qquickuniversalstyle.cpp b/src/imports/controls/universal/qquickuniversalstyle.cpp index a793034a..c581a784 100644 --- a/src/imports/controls/universal/qquickuniversalstyle.cpp +++ b/src/imports/controls/universal/qquickuniversalstyle.cpp @@ -531,8 +531,10 @@ static Enum toEnumValue(const QByteArray &value, bool *ok) static QByteArray resolveSetting(const QByteArray &env, const QSharedPointer<QSettings> &settings, const QString &name) { QByteArray value = qgetenv(env); +#if QT_CONFIG(settings) if (value.isNull() && !settings.isNull()) value = settings->value(name).toByteArray(); +#endif return value; } diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp index f6539ffc..184cbfc7 100644 --- a/src/quickcontrols2/qquickstyle.cpp +++ b/src/quickcontrols2/qquickstyle.cpp @@ -174,6 +174,7 @@ struct QQuickStyleSpec style = QString::fromLatin1(qgetenv("QT_QUICK_CONTROLS_STYLE")); if (fallbackStyle.isEmpty()) setFallbackStyle(QString::fromLatin1(qgetenv("QT_QUICK_CONTROLS_FALLBACK_STYLE")), "QT_QUICK_CONTROLS_FALLBACK_STYLE"); +#if QT_CONFIG(settings) if (style.isEmpty() || fallbackStyle.isEmpty()) { QSharedPointer<QSettings> settings = QQuickStyleAttached::settings(QStringLiteral("Controls")); if (settings) { @@ -183,6 +184,7 @@ struct QQuickStyleSpec setFallbackStyle(settings->value(QStringLiteral("FallbackStyle")).toString(), ":/qtquickcontrols2.conf"); } } +#endif // resolve a path relative to the config QString configPath = QFileInfo(resolveConfigFilePath()).path(); |