feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
b10b39a6dcd0faa477d6c42f1fb149833640297d
qt-creator/src/plugins/android/android.pro

104 lines
2.7 KiB
Prolog
Raw Normal View History

Android plugin Change-Id: Iad58914f067a6ef6d3412ccd42f757d821e39e45 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-18 20:30:57 +03:00
include(../../qtcreatorplugin.pri)
Mark Android plugin as experimental That disables it by default, pass ANDROID_ENABLE to qmake -r to change the default. The plugin is always built, thus it can be enabled/disabled in the settings. Change-Id: I29894f0fe1672a1920b43d38999717ce8b48868f Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-04-24 12:35:34 +02:00
isEmpty(ANDROID_ENABLE):ANDROID_EXPERIMENTAL_STR="true"
else:ANDROID_EXPERIMENTAL_STR="false"
Android plugin Change-Id: Iad58914f067a6ef6d3412ccd42f757d821e39e45 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-18 20:30:57 +03:00
QT += xml network
HEADERS += \
AndroidDebugSupport: Split up into general and qmake specific part Introudce AndroidQtSupport. The derived class will eventually move to the qmakeprojectmanager plugin. Change-Id: I3fdc98259644fe718eb15aa9bd11d92dc0cdb1af Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-06-24 16:47:38 +02:00
androidqtsupport.h \
Android plugin Change-Id: Iad58914f067a6ef6d3412ccd42f757d821e39e45 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-18 20:30:57 +03:00
androidconstants.h \
androidconfigurations.h \
Profile introduction Introduce Profiles to store sets of values that describe a system/device. These profiles are held by a target, getting rid of much of the information stored in the Build-/Run-/DeployConfigurations, greatly simplifying those. This is a squash of the wip/profile branch which has been on gerrit for a while, rebased to current master. Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-24 15:49:09 +02:00
androidmanager.h \
Android plugin Change-Id: Iad58914f067a6ef6d3412ccd42f757d821e39e45 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-18 20:30:57 +03:00
androidrunconfiguration.h \
androidruncontrol.h \
androidrunfactories.h \
androidsettingspage.h \
androidsettingswidget.h \
androidtoolchain.h \
Generic Android error messages We want to give better feedback for installation problems and other issues. There may still be undiscovered ways to mess up the creator configuration, and we might find them after the string freeze. This adds a number of strings that we can use later. We can add new error codes after the string freeze (and even in patch releases). This means that even if we can't give people detailed help for their problem in the UI, at least we give them a googleable string. We can then add better messages for the new errors in the next minor release. Change-Id: Ida7921fce5142d55144b0ba022de04726872187a Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-27 12:44:01 +02:00
androiderrormessage.h \
Android plugin Change-Id: Iad58914f067a6ef6d3412ccd42f757d821e39e45 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-18 20:30:57 +03:00
androidglobal.h \
androidrunner.h \
androiddebugsupport.h \
androidqtversionfactory.h \
androidqtversion.h \
androiddeployconfiguration.h \
androidcreatekeystorecertificate.h \
javaparser.h \
Fix Android plugin. Change-Id: I56533be94fc868d04bd1d289ff9d3c381391d41b Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-23 12:24:44 +03:00
androidplugin.h \
More Android fixes, add default android device. Switch to new android assests scheme Change-Id: I34bf52cbb085b76df66e40391160d189301aafd2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-03 16:57:44 +03:00
androiddevicefactory.h \
Simplify Android settings, move debugger/gdbserver to Kit Creator now realiable creates one toolchain for each toolchain found in the ndk. This no longer depends on any qt versions being present. Also the gdb command and gdb server command are moved to the Kit and are no longer found in the Android Options page. Both settings can be autodetected from the Kit options page. Note that this might break existing android kits. Change-Id: I1dce084f2bb372e615e19b1c9e3a1e205b5d9647 Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-01-25 16:49:22 +01:00
androiddevice.h \
Android: Add QML profiling Change-Id: Ie06c0b49707f8ec549f180f41c565fd223240186 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-03 12:41:58 +02:00
androidgdbserverkitinformation.h \
androidanalyzesupport.h \
Android: Implement a "editor" for android manifest files Change-Id: I18c00ab452db21e5aa1ae3ad2eff465cfeff54b6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-05-08 17:52:01 +02:00
androidmanifesteditorfactory.h \
androidmanifesteditor.h \
androidmanifesteditorwidget.h \
Android: Implement device selection dialog Change-Id: I1f4f3065a09837414429bbfc68110ada85ea174a Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-09-10 19:19:31 +02:00
androidmanifestdocument.h \
Android: androiddeployqt support Change-Id: I37d706b4e11c6e1353a8ee73378b7d080080678c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-09-17 18:24:57 +02:00
androiddevicedialog.h \
androiddeployqtstep.h \
certificatesmodel.h \
Android: Qt 5.2 deployment add a button to create a Android manifest The AndroidManifest.xml is no longer needed in as many use cases as before. So the new deployment does not automatically create a android manifest. Offer a button on the deployment page to create a android manifest. This also edits the .pro file adding the ANDROID_PACKAGE_SOURCE_DIR. Change-Id: I2655dd6c96e2087732b4d7240b31fe9fcf168600 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-09-26 18:38:44 +02:00
androiddeployqtwidget.h \
Extra library editor for Android Add a list view to the deployment settings which allows you to add and remove libraries from the ANDROID_EXTRA_LIBS variable in the .pro file. Task-number: QTCREATORBUG-9849 Change-Id: Ic0131c46be8fdef4b226b5ceb0ee82ea4dd82c6a Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-30 15:32:06 +02:00
androidpotentialkit.h \
Android: Add minimal Java editing support Indentation for blocks '{'. '}' and completion for keywords. TODO: "New File" is missing, TODO: probably needs some tweaks to the indentation. Task-number: QTCREATORBUG-11220 Change-Id: I758b3815e47d1427d39c0248eb16e39ffb7a29fb Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-01-15 16:58:52 +01:00
androidsignaloperation.h \
javaeditor.h \
javaindenter.h \
javaautocompleter.h \
Android: Add Java file wizard Task-number: QTCREATORBUG-11220 Change-Id: I01967ce9bd205ccbeb93696b98e9b8d9228617f3 Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-01-20 15:38:50 +01:00
javacompletionassistprovider.h \
AndroidDebugSupport: Split up into general and qmake specific part Introudce AndroidQtSupport. The derived class will eventually move to the qmakeprojectmanager plugin. Change-Id: I3fdc98259644fe718eb15aa9bd11d92dc0cdb1af Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-06-24 16:47:38 +02:00
avddialog.h \
android_global.h \
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>
2014-06-25 15:42:11 +02:00
androidbuildapkstep.h \
androidbuildapkwidget.h
Android plugin Change-Id: Iad58914f067a6ef6d3412ccd42f757d821e39e45 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-18 20:30:57 +03:00
SOURCES += \
androidconfigurations.cpp \
Profile introduction Introduce Profiles to store sets of values that describe a system/device. These profiles are held by a target, getting rid of much of the information stored in the Build-/Run-/DeployConfigurations, greatly simplifying those. This is a squash of the wip/profile branch which has been on gerrit for a while, rebased to current master. Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-24 15:49:09 +02:00
androidmanager.cpp \
Android plugin Change-Id: Iad58914f067a6ef6d3412ccd42f757d821e39e45 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-18 20:30:57 +03:00
androidrunconfiguration.cpp \
androidruncontrol.cpp \
androidrunfactories.cpp \
androidsettingspage.cpp \
androidsettingswidget.cpp \
androidtoolchain.cpp \
Generic Android error messages We want to give better feedback for installation problems and other issues. There may still be undiscovered ways to mess up the creator configuration, and we might find them after the string freeze. This adds a number of strings that we can use later. We can add new error codes after the string freeze (and even in patch releases). This means that even if we can't give people detailed help for their problem in the UI, at least we give them a googleable string. We can then add better messages for the new errors in the next minor release. Change-Id: Ida7921fce5142d55144b0ba022de04726872187a Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-27 12:44:01 +02:00
androiderrormessage.cpp \
Android plugin Change-Id: Iad58914f067a6ef6d3412ccd42f757d821e39e45 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-18 20:30:57 +03:00
androidrunner.cpp \
androiddebugsupport.cpp \
androidqtversionfactory.cpp \
androidqtversion.cpp \
androiddeployconfiguration.cpp \
androidcreatekeystorecertificate.cpp \
javaparser.cpp \
Fix Android plugin. Change-Id: I56533be94fc868d04bd1d289ff9d3c381391d41b Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-23 12:24:44 +03:00
androidplugin.cpp \
More Android fixes, add default android device. Switch to new android assests scheme Change-Id: I34bf52cbb085b76df66e40391160d189301aafd2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-03 16:57:44 +03:00
androiddevicefactory.cpp \
Simplify Android settings, move debugger/gdbserver to Kit Creator now realiable creates one toolchain for each toolchain found in the ndk. This no longer depends on any qt versions being present. Also the gdb command and gdb server command are moved to the Kit and are no longer found in the Android Options page. Both settings can be autodetected from the Kit options page. Note that this might break existing android kits. Change-Id: I1dce084f2bb372e615e19b1c9e3a1e205b5d9647 Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-01-25 16:49:22 +01:00
androiddevice.cpp \
Android: Add QML profiling Change-Id: Ie06c0b49707f8ec549f180f41c565fd223240186 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-03 12:41:58 +02:00
androidgdbserverkitinformation.cpp \
androidanalyzesupport.cpp \
Android: Implement a "editor" for android manifest files Change-Id: I18c00ab452db21e5aa1ae3ad2eff465cfeff54b6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-05-08 17:52:01 +02:00
androidmanifesteditorfactory.cpp \
androidmanifesteditor.cpp \
androidmanifesteditorwidget.cpp \
Android: Implement device selection dialog Change-Id: I1f4f3065a09837414429bbfc68110ada85ea174a Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-09-10 19:19:31 +02:00
androidmanifestdocument.cpp \
Android: androiddeployqt support Change-Id: I37d706b4e11c6e1353a8ee73378b7d080080678c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-09-17 18:24:57 +02:00
androiddevicedialog.cpp \
androiddeployqtstep.cpp \
certificatesmodel.cpp \
Android: Qt 5.2 deployment add a button to create a Android manifest The AndroidManifest.xml is no longer needed in as many use cases as before. So the new deployment does not automatically create a android manifest. Offer a button on the deployment page to create a android manifest. This also edits the .pro file adding the ANDROID_PACKAGE_SOURCE_DIR. Change-Id: I2655dd6c96e2087732b4d7240b31fe9fcf168600 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-09-26 18:38:44 +02:00
androiddeployqtwidget.cpp \
Extra library editor for Android Add a list view to the deployment settings which allows you to add and remove libraries from the ANDROID_EXTRA_LIBS variable in the .pro file. Task-number: QTCREATORBUG-9849 Change-Id: Ic0131c46be8fdef4b226b5ceb0ee82ea4dd82c6a Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-30 15:32:06 +02:00
androidpotentialkit.cpp \
Android: Add minimal Java editing support Indentation for blocks '{'. '}' and completion for keywords. TODO: "New File" is missing, TODO: probably needs some tweaks to the indentation. Task-number: QTCREATORBUG-11220 Change-Id: I758b3815e47d1427d39c0248eb16e39ffb7a29fb Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-01-15 16:58:52 +01:00
androidsignaloperation.cpp \
javaeditor.cpp \
javaindenter.cpp \
javaautocompleter.cpp \
Android: Add Java file wizard Task-number: QTCREATORBUG-11220 Change-Id: I01967ce9bd205ccbeb93696b98e9b8d9228617f3 Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-01-20 15:38:50 +01:00
javacompletionassistprovider.cpp \
AndroidDebugSupport: Split up into general and qmake specific part Introudce AndroidQtSupport. The derived class will eventually move to the qmakeprojectmanager plugin. Change-Id: I3fdc98259644fe718eb15aa9bd11d92dc0cdb1af Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-06-24 16:47:38 +02:00
avddialog.cpp \
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>
2014-06-25 15:42:11 +02:00
androidbuildapkstep.cpp \
Android: Say hello to gradle! Switching from Ant to Gradle brings lots of advantages: - it is way faster when rebuilding (25-50% faster than ant). - it enables first class Android Studio integration. - adding Android Extras libs (e.g. Google Play services, OBB, etc.) to your project is now painless. [ChangeLog][Android] Added Gradle support to build the APK. Change-Id: Iee492954f8ffb2c22e6ab14a8a25faf644de9a51 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-22 16:20:51 +03:00
androidbuildapkwidget.cpp \
androidqtsupport.cpp
Android plugin Change-Id: Iad58914f067a6ef6d3412ccd42f757d821e39e45 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-18 20:30:57 +03:00
FORMS += \
androidsettingswidget.ui \
addnewavddialog.ui \
Android: Implement device selection dialog Change-Id: I1f4f3065a09837414429bbfc68110ada85ea174a Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-09-10 19:19:31 +02:00
androidcreatekeystorecertificate.ui \
Android: androiddeployqt support Change-Id: I37d706b4e11c6e1353a8ee73378b7d080080678c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-09-17 18:24:57 +02:00
androiddevicedialog.ui \
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>
2014-06-25 15:42:11 +02:00
androiddeployqtwidget.ui \
androidbuildapkwidget.ui
Android plugin Change-Id: Iad58914f067a6ef6d3412ccd42f757d821e39e45 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-18 20:30:57 +03:00
RESOURCES = android.qrc
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>
2014-06-25 15:42:11 +02:00
Android plugin Change-Id: Iad58914f067a6ef6d3412ccd42f757d821e39e45 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-18 20:30:57 +03:00
DEFINES += ANDROID_LIBRARY
Copy Permalink