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/quickcontrols2/qquickstyle.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/quickcontrols2/qquickstyle.cpp') 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 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(); -- cgit v1.2.3