Merge remote-tracking branch 'origin/5.11' into 5.12

* origin/5.11:
  5d8d87f Fix mediaplayer default video path
  fa623c1 Fix qtquickcontrols2 theme & icon issues
  3c8dd0c Move color definitions to QSettings

Change-Id: Ie358cb789a98077e5845e66959bec465605b14cb

1 files changed, 27 insertions, 0 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 1a5d3ec..249f5a1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -36,6 +36,8 @@
 #include <QtQml/QQmlApplicationEngine>
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlComponent>
+#include <QStandardPaths>
+#include <QIcon>
 
 #include <QQuickStyle>
 
@@ -67,6 +69,12 @@ int main(int argc, char **argv)
 {
     qputenv("QT_IM_MODULE", QByteArray("qtvirtualkeyboard"));
 
+    qputenv("QT_QUICK_CONTROLS_CONF", "/data/user/qt/qtquickcontrols2/qtquickcontrols2.conf");
+    QIcon::setThemeSearchPaths(QStringList() << "/data/user/qt/qtquickcontrols2/icons");
+
+    QIcon::setThemeName("gallery");
+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+
     QApplication app(argc, argv);
     app.setApplicationVersion(APPLICATION_VERSION);
 
@@ -101,10 +109,29 @@ int main(int argc, char **argv)
 
     QQmlApplicationEngine engine;
     SettingsManager settings;
+
     QtImageProvider imageProvider;
     QtSquareImageProvider squareImageProvider;
     QtImageMaskProvider imageMaskProvider;
 
+    QSettings styleSettings;
+    QString style = styleSettings.value("style").toString();
+    if (style.isEmpty() || style == "Default")
+        styleSettings.setValue("style", "Material");
+    QQuickStyle::setStyle(styleSettings.value("style").toString());
+
+    QSettings launcherSettings("QtLauncher", "colorSettings");
+
+    engine.rootContext()->setContextProperty("_backgroundColor", launcherSettings.value("backgroundColor", "#09102b"));
+    engine.rootContext()->setContextProperty("_primaryGreen", launcherSettings.value("primaryGreen", "#41cd52"));
+    engine.rootContext()->setContextProperty("_mediumGreen", launcherSettings.value("mediumGreen", "#21be2b"));
+    engine.rootContext()->setContextProperty("_darkGreen", launcherSettings.value("darkGreen", "#17a81a"));
+    engine.rootContext()->setContextProperty("_primaryGrey", launcherSettings.value("primaryGrey", "#9d9faa"));
+    engine.rootContext()->setContextProperty("_secondaryGrey", launcherSettings.value("secondaryGrey", "#3a4055"));
+
+    engine.rootContext()->setContextProperty("VideosLocation", launcherSettings.value("videosLocation", "file:///data/videos"));
+    engine.rootContext()->setContextProperty("DefaultVideoUrl", launcherSettings.value("defaultVideoUrl", "file:///data/videos/Qt+for+Device+Creation.mp4"));
+
     engine.addImageProvider("QtImage", &imageProvider);
     engine.addImageProvider("QtSquareImage", &squareImageProvider);
     engine.addImageProvider("QtImageMask", &imageMaskProvider);