diff options
| author | Rainer Keller <rainer.keller@digia.com> | 2013-03-18 15:03:39 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@digia.com> | 2013-03-19 12:33:38 +0100 |
| commit | 139c7613388cff9f8a97cdf6ade838a370f5e052 (patch) | |
| tree | 030dbde590f65ed22c6b83801d6c6a9df02fe5b4 | |
| parent | b079d623e86307337d14a2187fd16f86aab86dd8 (diff) | |
| download | qt-creator-139c7613388cff9f8a97cdf6ade838a370f5e052.tar.gz | |
Support deployment to android-no-sdk platform
Change-Id: Ia7dad81e4998e04cbcda51de420ca677f56aa63f
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| -rw-r--r-- | share/qtcreator/templates/shared/deployment.pri | 18 | ||||
| -rw-r--r-- | src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp | 2 |
2 files changed, 18 insertions, 2 deletions
diff --git a/share/qtcreator/templates/shared/deployment.pri b/share/qtcreator/templates/shared/deployment.pri index cf304118e8..21ee643ae2 100644 --- a/share/qtcreator/templates/shared/deployment.pri +++ b/share/qtcreator/templates/shared/deployment.pri @@ -22,7 +22,23 @@ for(deploymentfolder, DEPLOYMENTFOLDERS) { MAINPROFILEPWD = $$PWD -android { +android-no-sdk { + for(deploymentfolder, DEPLOYMENTFOLDERS) { + item = item$${deploymentfolder} + itemfiles = $${item}.files + $$itemfiles = $$eval($${deploymentfolder}.source) + itempath = $${item}.path + $$itempath = /data/user/qt/$$eval($${deploymentfolder}.target) + export($$itemfiles) + export($$itempath) + INSTALLS += $$item + } + + target.path = /data/user/qt + + export(target.path) + INSTALLS += target +} else:android { for(deploymentfolder, DEPLOYMENTFOLDERS) { item = item$${deploymentfolder} itemfiles = $${item}.files diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp index 343f026993..f64d2fc10c 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp @@ -57,7 +57,7 @@ const QString AbstractMobileApp::ProFileComment(QLatin1String("#")); const QString AbstractMobileApp::DeploymentPriFileName(QLatin1String("deployment.pri")); const QString AbstractMobileApp::FileChecksum(QLatin1String("checksum")); const QString AbstractMobileApp::FileStubVersion(QLatin1String("version")); -const int AbstractMobileApp::StubVersion = 8; +const int AbstractMobileApp::StubVersion = 9; AbstractMobileApp::AbstractMobileApp() : QObject() |