forked from qt-creator/qt-creator
Move qmake specific part to qmake plugin, generalize android support
- Split up androiddeployqt into two steps: One building the apk, and one deploying it to the device. - The build apk step base class AndroidBuildApkStep is ihneritaged by the qmake specific class QmakeAndroidBuildApkStep. - The deployment step is still called androiddeployqt - Move all qmake specific code to the qmakeprojectmanager plguin - Flip the depencency between the android and qmake plugin, now the qmake plugin depends on the android plugin, implementing a interface the android plugin provides. - Note: This removes the debug deployment for now. Change-Id: I1c386640159ed14b637668abde8eb3b9009ab803 Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
committed by
Daniel Teske
parent
4657ac7452
commit
64e5a543a8
@@ -73,7 +73,7 @@ using namespace ProjectExplorer;
|
||||
using namespace Utils;
|
||||
|
||||
namespace Android {
|
||||
namespace Internal {
|
||||
using namespace Internal;
|
||||
|
||||
namespace {
|
||||
const QLatin1String SettingsGroup("AndroidConfigurations");
|
||||
@@ -343,6 +343,11 @@ QStringList AndroidConfig::apiLevelNamesFor(const QList<SdkPlatform> &platforms)
|
||||
return results;
|
||||
}
|
||||
|
||||
QString AndroidConfig::apiLevelNameFor(const SdkPlatform &platform)
|
||||
{
|
||||
return QLatin1String("android-") + QString::number(platform.apiLevel);
|
||||
}
|
||||
|
||||
QList<SdkPlatform> AndroidConfig::sdkTargets(int minApiLevel) const
|
||||
{
|
||||
updateAvailableSdkPlatforms();
|
||||
@@ -1294,5 +1299,4 @@ void AndroidConfigurations::updateAndroidDevice()
|
||||
|
||||
AndroidConfigurations *AndroidConfigurations::m_instance = 0;
|
||||
|
||||
} // namespace Internal
|
||||
} // namespace Android
|
||||
|
Reference in New Issue
Block a user