diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2019-07-15 14:29:49 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2019-07-24 07:52:32 +0000 |
| commit | 051174fb571e889bb70056e5cab25de1d4630d76 (patch) | |
| tree | b7b0f10aae301cdb7c0790746911f7f360f1bcf3 /src | |
| parent | 7f29eb621478e42999984935197e396d2b782359 (diff) | |
Remove hard-coded values for default video and default location
The hard-coded values are moved to the boot2qt-launcher yocto recipe boot2qt-launcher_git.bb, which installs a config file with the needed values.
Task-number: QTBUG-70156
Change-Id: I3bfba1de3cb232a7e5120bfb2e90101dc30035e0
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 792351f..764a745 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -142,7 +142,7 @@ int main(int argc, char **argv) } QQuickStyle::setStyle(styleSettings.value("style").toString()); - QSettings launcherSettings("QtLauncher", "colorSettings"); + QSettings launcherSettings("Qt", "QtLauncher"); engine.rootContext()->setContextProperty("_backgroundColor", launcherSettings.value("backgroundColor", "#09102b")); engine.rootContext()->setContextProperty("_primaryGreen", launcherSettings.value("primaryGreen", "#41cd52")); @@ -151,8 +151,11 @@ int main(int argc, char **argv) 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+Designers+and+Developers.mp4")); + engine.rootContext()->setContextProperty("VideosLocation", + launcherSettings.value("videosLocation")); + engine.rootContext()->setContextProperty("DefaultVideoUrl", + launcherSettings.value("defaultVideoUrl")); + engine.addImageProvider("QtImage", &imageProvider); engine.addImageProvider("QtSquareImage", &squareImageProvider); |