feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Readd Android specific code for Qt Quick 2 template

Browse Source 
I tested that it works.

Change-Id: I01387c302c48f3ba9244ba40099f1dead970fb33
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Daniel Teske
2013-01-18 14:35:43 +01:00
parent 7b39f41c05
commit 1edce87173
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
share/qtcreator/templates/qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.cpp
View File

@@ -26,7 +26,7 @@ QString QtQuick2ApplicationViewerPrivate::adjustPath(const QString &path)
if (!QDir::isAbsolutePath(path)) if (!QDir::isAbsolutePath(path))
return QString::fromLatin1("%1/../Resources/%2") return QString::fromLatin1("%1/../Resources/%2")
.arg(QCoreApplication::applicationDirPath(), path); .arg(QCoreApplication::applicationDirPath(), path);
#elif defined(Q_OS_UNIX) #elif defined(Q_OS_UNIX) && !defined(Q_OS_ANDROID)
const QString pathInInstallDir = const QString pathInInstallDir =
QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path); QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
if (QFileInfo(pathInInstallDir).exists()) if (QFileInfo(pathInInstallDir).exists())
@@ -51,7 +51,11 @@ QtQuick2ApplicationViewer::~QtQuick2ApplicationViewer()
void QtQuick2ApplicationViewer::setMainQmlFile(const QString &file) void QtQuick2ApplicationViewer::setMainQmlFile(const QString &file)
{ {
d->mainQmlFile = QtQuick2ApplicationViewerPrivate::adjustPath(file); d->mainQmlFile = QtQuick2ApplicationViewerPrivate::adjustPath(file);
#ifdef Q_OS_ANDROID
setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
#else
setSource(QUrl::fromLocalFile(d->mainQmlFile)); setSource(QUrl::fromLocalFile(d->mainQmlFile));
#endif
} }
void QtQuick2ApplicationViewer::addImportPath(const QString &path) void QtQuick2ApplicationViewer::addImportPath(const QString &path)

2
src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
View File

@@ -227,7 +227,7 @@ QByteArray QtQuickApp::generateFileExtended(int fileType,
int QtQuickApp::stubVersionMinor() const int QtQuickApp::stubVersionMinor() const
{ {
return m_componentSet == QtQuick20Components ? 1 : 22; return m_componentSet == QtQuick20Components ? 2 : 22;
} }
QList<AbstractGeneratedFileInfo> QtQuickApp::updateableFiles(const QString &mainProFile) const QList<AbstractGeneratedFileInfo> QtQuickApp::updateableFiles(const QString &mainProFile) const