From 1edce87173acbef69df733fe1aef348afbeae4ba Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Fri, 18 Jan 2013 14:35:43 +0100 Subject: [PATCH] Readd Android specific code for Qt Quick 2 template I tested that it works. Change-Id: I01387c302c48f3ba9244ba40099f1dead970fb33 Reviewed-by: Kai Koehne Reviewed-by: Alessandro Portale Reviewed-by: BogDan Vatra --- .../qtquick2applicationviewer/qtquick2applicationviewer.cpp | 6 +++++- src/plugins/qt4projectmanager/wizards/qtquickapp.cpp | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/share/qtcreator/templates/qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.cpp b/share/qtcreator/templates/qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.cpp index 261849538e8..f8e98afc749 100644 --- a/share/qtcreator/templates/qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.cpp +++ b/share/qtcreator/templates/qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.cpp @@ -26,7 +26,7 @@ QString QtQuick2ApplicationViewerPrivate::adjustPath(const QString &path) if (!QDir::isAbsolutePath(path)) return QString::fromLatin1("%1/../Resources/%2") .arg(QCoreApplication::applicationDirPath(), path); -#elif defined(Q_OS_UNIX) +#elif defined(Q_OS_UNIX) && !defined(Q_OS_ANDROID) const QString pathInInstallDir = QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path); if (QFileInfo(pathInInstallDir).exists()) @@ -51,7 +51,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) diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp index 9044a7f501c..91b37103a04 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp @@ -227,7 +227,7 @@ QByteArray QtQuickApp::generateFileExtended(int fileType, int QtQuickApp::stubVersionMinor() const { - return m_componentSet == QtQuick20Components ? 1 : 22; + return m_componentSet == QtQuick20Components ? 2 : 22; } QList QtQuickApp::updateableFiles(const QString &mainProFile) const