diff options
author | Juho Annunen <juho.annunen@qt.io> | 2018-08-28 11:50:07 +0300 |
---|---|---|
committer | Juho Annunen <juho.annunen@qt.io> | 2018-08-28 09:13:32 +0000 |
commit | 5d8d87f96559a577bb72d2eb02a3ed798c480948 (patch) | |
tree | bd2a9bc716aa4dadb9e4766054f03b23e8d43329 | |
parent | fa623c18978c2b9a60380abe5471ad8b6c4d601c (diff) |
Fix mediaplayer default video path
Task-number: QTBUG-70198
Change-Id: Ib417fe07b5b465ce5de21a878c7511448eb305a1
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r-- | src/main.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/main.cpp b/src/main.cpp index bf763e1..249f5a1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -109,6 +109,7 @@ int main(int argc, char **argv) QQmlApplicationEngine engine; SettingsManager settings; + QtImageProvider imageProvider; QtSquareImageProvider squareImageProvider; QtImageMaskProvider imageMaskProvider; @@ -119,14 +120,17 @@ int main(int argc, char **argv) styleSettings.setValue("style", "Material"); QQuickStyle::setStyle(styleSettings.value("style").toString()); - QSettings themeColorSettings("QtLauncher", "colorSettings"); + 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("_backgroundColor", themeColorSettings.value("backgroundColor", "#09102b")); - engine.rootContext()->setContextProperty("_primaryGreen", themeColorSettings.value("primaryGreen", "#41cd52")); - engine.rootContext()->setContextProperty("_mediumGreen", themeColorSettings.value("mediumGreen", "#21be2b")); - engine.rootContext()->setContextProperty("_darkGreen", themeColorSettings.value("darkGreen", "#17a81a")); - engine.rootContext()->setContextProperty("_primaryGrey", themeColorSettings.value("primaryGrey", "#9d9faa")); - engine.rootContext()->setContextProperty("_secondaryGrey", themeColorSettings.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); |