summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKimmo Ollila <kimmo.ollila@digia.com>2013-04-16 12:25:39 +0300
committerKimmo Ollila <kimmo.ollila@digia.com>2013-04-16 12:30:44 +0300
commit8e762a9665025710c728f5dd3c18e0248f41fb9f (patch)
tree2a212b5feb0e46d54aedb871dc5f3f308ea7a0f4
parente4a91625c9f06617ea964a3ffa76066faa78616a (diff)
main.qml path fix for Android
Change-Id: Ife0705aad20078ee3cd1749b0300d58017f9ac81 Reviewed-by: Lasse Räihä <lasse.raiha@digia.com>
-rw-r--r--QtDemo/qtquick2applicationviewer/qtquick2applicationviewer.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/QtDemo/qtquick2applicationviewer/qtquick2applicationviewer.cpp b/QtDemo/qtquick2applicationviewer/qtquick2applicationviewer.cpp
index 547602d..e755c83 100644
--- a/QtDemo/qtquick2applicationviewer/qtquick2applicationviewer.cpp
+++ b/QtDemo/qtquick2applicationviewer/qtquick2applicationviewer.cpp
@@ -52,7 +52,11 @@ QtQuick2ApplicationViewer::~QtQuick2ApplicationViewer()
void QtQuick2ApplicationViewer::setMainQmlFile(const QString &file)
{
d->mainQmlFile = QtQuick2ApplicationViewerPrivate::adjustPath(file);
+#ifdef Q_OS_ANDROID
+ setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
+#else
setSource(QUrl::fromLocalFile(d->mainQmlFile));
+#endif
}
void QtQuick2ApplicationViewer::addImportPath(const QString &path)