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,6 +73,11 @@ const char JAVA_MIMETYPE[] = "text/x-java";
|
||||
const char WIZARD_JAVA[] = "Wizard.Java";
|
||||
const char JAVA_WIZARD_CATEGORY[] = "U.Java";
|
||||
const char JAVA_DISPLAY_CATEGORY[] = "Java";
|
||||
const char ANDROID_ARCHITECTURE[] = "Android.Architecture";
|
||||
const char ANDROID_DEPLOY_SETTINGS_FILE[] = "AndroidDeploySettingsFile";
|
||||
const char ANDROID_PACKAGE_SOURCE_DIR[] = "AndroidPackageSourceDir";
|
||||
const char ANDROID_EXTRA_LIBS[] = "AndroidExtraLibs";
|
||||
|
||||
} // namespace Constants;
|
||||
} // namespace Android
|
||||
|
||||
|
||||
Reference in New Issue
Block a user