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
@@ -16,8 +16,6 @@ HEADERS += \
|
||||
androidsettingspage.h \
|
||||
androidsettingswidget.h \
|
||||
androidtoolchain.h \
|
||||
androidpackageinstallationstep.h \
|
||||
androidpackageinstallationfactory.h \
|
||||
androiderrormessage.h \
|
||||
androidglobal.h \
|
||||
androidrunner.h \
|
||||
@@ -41,9 +39,7 @@ HEADERS += \
|
||||
androiddeployqtstep.h \
|
||||
certificatesmodel.h \
|
||||
androiddeployqtwidget.h \
|
||||
createandroidmanifestwizard.h \
|
||||
androidpotentialkit.h \
|
||||
androidextralibrarylistmodel.h \
|
||||
androidsignaloperation.h \
|
||||
javaeditor.h \
|
||||
javaeditorfactory.h \
|
||||
@@ -53,9 +49,8 @@ HEADERS += \
|
||||
javafilewizard.h \
|
||||
avddialog.h \
|
||||
android_global.h \
|
||||
qmakeandroidsupport.h \
|
||||
qmakeandroidrunfactories.h \
|
||||
qmakeandroidrunconfiguration.h
|
||||
androidbuildapkstep.h \
|
||||
androidbuildapkwidget.h
|
||||
|
||||
SOURCES += \
|
||||
androidconfigurations.cpp \
|
||||
@@ -66,8 +61,6 @@ SOURCES += \
|
||||
androidsettingspage.cpp \
|
||||
androidsettingswidget.cpp \
|
||||
androidtoolchain.cpp \
|
||||
androidpackageinstallationstep.cpp \
|
||||
androidpackageinstallationfactory.cpp \
|
||||
androiderrormessage.cpp \
|
||||
androidrunner.cpp \
|
||||
androiddebugsupport.cpp \
|
||||
@@ -90,9 +83,7 @@ SOURCES += \
|
||||
androiddeployqtstep.cpp \
|
||||
certificatesmodel.cpp \
|
||||
androiddeployqtwidget.cpp \
|
||||
createandroidmanifestwizard.cpp \
|
||||
androidpotentialkit.cpp \
|
||||
androidextralibrarylistmodel.cpp \
|
||||
androidsignaloperation.cpp \
|
||||
javaeditor.cpp \
|
||||
javaeditorfactory.cpp \
|
||||
@@ -101,16 +92,17 @@ SOURCES += \
|
||||
javacompletionassistprovider.cpp \
|
||||
javafilewizard.cpp \
|
||||
avddialog.cpp \
|
||||
qmakeandroidsupport.cpp \
|
||||
qmakeandroidrunfactories.cpp \
|
||||
qmakeandroidrunconfiguration.cpp
|
||||
androidbuildapkstep.cpp \
|
||||
androidbuildapkwidget.cpp
|
||||
|
||||
FORMS += \
|
||||
androidsettingswidget.ui \
|
||||
addnewavddialog.ui \
|
||||
androidcreatekeystorecertificate.ui \
|
||||
androiddevicedialog.ui \
|
||||
androiddeployqtwidget.ui
|
||||
androiddeployqtwidget.ui \
|
||||
androidbuildapkwidget.ui
|
||||
|
||||
RESOURCES = android.qrc
|
||||
|
||||
DEFINES += ANDROID_LIBRARY
|
||||
|
||||
Reference in New Issue
Block a user