From 57bc95f418a0e42921bba984d35d5999c6a6cf8f Mon Sep 17 00:00:00 2001
From: Juho Annunen <juho.annunen@qt.io>
Date: Tue, 17 Jul 2018 15:50:48 +0300
Subject: Fix qtquickcontrols2 demo image paths & controls theme

Task-number: QTBUG-62805
Change-Id: I6cbd41384c003b1e29567af0c0c56341d5e93f6e
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
---
 basicsuite/shared/main.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'basicsuite/shared')

diff --git a/basicsuite/shared/main.cpp b/basicsuite/shared/main.cpp
index 6fba612..265092c 100644
--- a/basicsuite/shared/main.cpp
+++ b/basicsuite/shared/main.cpp
@@ -65,6 +65,7 @@
 #include <QtQml/QQmlComponent>
 #include <QSettings>
 #include <QQuickStyle>
+#include <QIcon>
 
 #if defined(USE_QTWEBENGINE)
 #include <qtwebengineglobal.h>
@@ -75,7 +76,10 @@
 int main(int argc, char **argv)
 {
     //qputenv("QT_IM_MODULE", QByteArray("qtvkb"));
-    qputenv("QT_QUICK_CONTROLS_CONF", "/data/user/gallery/qtquickcontrols2.conf");
+    qputenv("QT_QUICK_CONTROLS_CONF", "/data/user/qt/qtquickcontrols2/qtquickcontrols2.conf");
+    QIcon::setThemeName("gallery");
+    QIcon::setThemeSearchPaths(QStringList() << "/data/user/qt/qtquickcontrols2/icons");
+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QApplication app(argc, argv);
 
 #if defined(USE_QTWEBENGINE)
@@ -131,12 +135,11 @@ int main(int argc, char **argv)
         QGuiApplication::setFont(font);
     }
 
-    QSettings settings;
-    QString style = QQuickStyle::name();
-    if (!style.isEmpty())
-        settings.setValue("style", "Material");
-    else
-        QQuickStyle::setStyle(settings.value("style").toString());
+    QSettings styleSettings;
+    QString style = styleSettings.value("style").toString();
+    if (style.isEmpty() || style == "Default")
+        styleSettings.setValue("style", "Material");
+    QQuickStyle::setStyle(styleSettings.value("style").toString());
 
     DummyEngine engine;
 
-- 
cgit v1.2.3