From 283e95aaf299b6bb320dbacabb099d91f070f116 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 31 Jan 2017 12:58:32 +0100 Subject: Fix build with -no-feature-settings Change-Id: I204c50539288df16c4d4010e91c8ecc60f202ec6 Reviewed-by: Paul Olav Tvete --- src/imports/controls/material/qquickmaterialstyle.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/imports/controls/material') 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 &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; } -- cgit v1.2.3