diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-05-15 10:21:47 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-05-15 10:21:47 +0200 |
| commit | 6fb94a7b10216cb03544acfca1ea5e7e121dd50e (patch) | |
| tree | 2e5aba50125b1bda1ccb1739b5a6c39336e6333a /src/plugins/android/androidmanager.h | |
| parent | c6bee7e20eff2cefe3300d2d5a9fc23508402e98 (diff) | |
| parent | 8ca5b55a0bafd744cf62c20de379a7738cb76138 (diff) | |
| download | qt-creator-6fb94a7b10216cb03544acfca1ea5e7e121dd50e.tar.gz | |
Merge branch '2.7'
Conflicts:
doc/src/qtquick/qtquick-components.qdoc
doc/src/qtquick/qtquick-designer.qdoc
qtcreator.pri
qtcreator.qbs
src/plugins/cppeditor/cppinsertdecldef.cpp
src/plugins/qnx/qnxruncontrolfactory.cpp
Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
Diffstat (limited to 'src/plugins/android/androidmanager.h')
| -rw-r--r-- | src/plugins/android/androidmanager.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/plugins/android/androidmanager.h b/src/plugins/android/androidmanager.h index 0f6b3d2293..5d16604729 100644 --- a/src/plugins/android/androidmanager.h +++ b/src/plugins/android/androidmanager.h @@ -85,7 +85,8 @@ public: static bool setTargetApplication(ProjectExplorer::Target *target, const QString &name); static QString targetApplicationPath(ProjectExplorer::Target *target); - static bool setUseLocalLibs(ProjectExplorer::Target *target, bool useLocalLibs, int deviceAPILevel); + static bool updateDeploymentSettings(ProjectExplorer::Target *target); + static bool bundleQt(ProjectExplorer::Target *target); static QString targetSDK(ProjectExplorer::Target *target); static bool setTargetSDK(ProjectExplorer::Target *target, const QString &sdk); @@ -105,9 +106,10 @@ public: const QString &name = QString()); static Utils::FileName localLibsRulesFilePath(ProjectExplorer::Target *target); - static QString loadLocalLibs(ProjectExplorer::Target *target, int apiLevel); - static QString loadLocalJars(ProjectExplorer::Target *target, int apiLevel); - static QString loadLocalJarsInitClasses(ProjectExplorer::Target *target, int apiLevel); + static QString loadLocalLibs(ProjectExplorer::Target *target, int apiLevel = -1); + static QString loadLocalJars(ProjectExplorer::Target *target, int apiLevel = -1); + static QString loadLocalBundledFiles(ProjectExplorer::Target *target, int apiLevel = -1); + static QString loadLocalJarsInitClasses(ProjectExplorer::Target *target, int apiLevel = -1); class Library { @@ -125,11 +127,17 @@ public: static QStringList qtLibs(ProjectExplorer::Target *target); static bool setQtLibs(ProjectExplorer::Target *target, const QStringList &libs); + static bool setBundledInLib(ProjectExplorer::Target *target, + const QStringList &fileList); + static bool setBundledInAssets(ProjectExplorer::Target *target, + const QStringList &fileList); + static QStringList availablePrebundledLibs(ProjectExplorer::Target *target); static QStringList prebundledLibs(ProjectExplorer::Target *target); static bool setPrebundledLibs(ProjectExplorer::Target *target, const QStringList &libs); static QString libGnuStl(const QString &arch, const QString &ndkToolChainVersion); + static QString libraryPrefix(); private: static void raiseError(const QString &reason); @@ -145,7 +153,9 @@ private: enum ItemType { Lib, - Jar + Jar, + BundledFile, + BundledJar }; static QString loadLocal(ProjectExplorer::Target *target, int apiLevel, ItemType item, const QString &attribute=QLatin1String("file")); |