summaryrefslogtreecommitdiff
path: root/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Move icons to UtilsUlf Hermann2016-08-051-2/+3
| | | | | | | This way we can use them from libraries, not only from plugins. Change-Id: Ic35cfd5f04d638d87606bf272b2c00ded1267c1b Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: Use Qt5-style connectsOrgad Shaneh2016-07-041-10/+10
| | | | | | | The heavy lifting was done by clazy. Change-Id: Id09b62b7b9812d9c0981202c257d18387a8b09d9 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-18/+13
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Themed Icons: Introduce Utils::IconAlessandro Portale2015-11-251-4/+2
| | | | | | | | | | | | | | Instead of describing icons via file name or in the themed icons case via a string that is a list of mask/color pairs, we have now a class for it. Icons are now listed in per-plugin *icons.h headers. RunControl::m_icon was The only place left where an icon property was in fact a string. This patch changes that member to be a Utils::Icon. Change-Id: Ibcfa8bb25e6d2e330c567ee7ccc0b97ead603177 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Icon refresh: First step towards the new Qt Creator themesAlessandro Portale2015-10-231-1/+4
| | | | | | | | | | http://blog.qt.io/blog/author/didesous/ announced new designs/themes for Qt Creator. This patch replaces many of the existing toolbar icons with recolorizable masks for better theming support. Change-Id: I557aa485205fe2624f33724226f698c303342b40 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* Android: Adding libraries to subdirs projectsDaniel Teske2015-03-171-1/+1
| | | | | | | Task-number: QTCREATORBUG-11625 Change-Id: I1017546463e819fc05846af74582cb9f5739ff08 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-121-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/tooltip/tipcontents.cpp src/libs/utils/tooltip/tipcontents.h src/plugins/android/androiddeployqtstep.cpp src/plugins/baremetal/baremetalconstants.h src/plugins/baremetal/baremetaldevice.cpp src/plugins/baremetal/baremetaldevice.h src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp src/plugins/baremetal/baremetaldeviceconfigurationwidget.h src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h src/plugins/baremetal/baremetalplugin.cpp src/plugins/baremetal/baremetalplugin.h src/plugins/baremetal/baremetalruncontrolfactory.cpp src/plugins/baremetal/baremetalruncontrolfactory.h src/plugins/cppeditor/cppcodemodelinspectordialog.cpp src/plugins/cppeditor/cppdoxygen_test.cpp src/plugins/cppeditor/cppdoxygen_test.h src/plugins/debugger/breakpointmarker.cpp src/plugins/debugger/debuggeritemmodel.cpp src/plugins/debugger/debuggeritemmodel.h src/plugins/debugger/loadcoredialog.cpp src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp src/plugins/projectexplorer/addnewmodel.cpp src/plugins/projectexplorer/addnewmodel.h src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp src/plugins/qmlprofiler/abstracttimelinemodel.cpp src/plugins/qmlprofiler/abstracttimelinemodel.h src/plugins/qmlprofiler/notesmodel.cpp src/plugins/qmlprofiler/qml/CategoryLabel.qml src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qml/Overview.js src/plugins/qmlprofiler/qml/Overview.qml src/plugins/qmlprofiler/qml/TimeDisplay.qml src/plugins/qmlprofiler/qml/TimeMarks.qml src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp src/plugins/qmlprofiler/sortedtimelinemodel.cpp src/plugins/qmlprofiler/sortedtimelinemodel.h src/plugins/qmlprofiler/timelinemodelaggregator.cpp src/plugins/qmlprofiler/timelinemodelaggregator.h src/plugins/qmlprofiler/timelinerenderer.cpp src/plugins/qmlprofiler/timelinerenderer.h src/plugins/qmlprojectmanager/QmlProjectManager.json.in src/plugins/texteditor/findinfiles.cpp src/plugins/vcsbase/vcsconfigurationpage.cpp src/shared/qbs src/shared/scriptwrapper/interface_wrap_helpers.h src/shared/scriptwrapper/wrap_helpers.h tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp tests/system/suite_debugger/tst_debug_empty_main/test.py tests/system/suite_debugger/tst_qml_js_console/test.py tests/system/suite_debugger/tst_qml_locals/test.py Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
| * Update LicenseEike Ziller2015-01-161-6/+6
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Android: Fix namespace closing brace commentOrgad Shaneh2015-02-061-1/+1
| | | | | | | | | | Change-Id: I6ae4d7652db9d83c24009de9f59bd865c39db8bc Reviewed-by: BogDan Vatra <bogdan@kde.org>
* | Android: Replace setting for input .json file and use active rc insteadDaniel Teske2015-01-271-41/+1
|/ | | | | | | | That's a more natural approach to select the application .pro file Task-number: QTCREATORBUG-13732 Change-Id: I8c6745bea4b408e1d4f7ed2cd4e1d50798c60881 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* License update.Eike Ziller2014-10-151-7/+8
| | | | | Change-Id: I0acde2c3b995693de682679471f03af85bdd0a61 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Android: Say hello to gradle!BogDan Vatra2014-09-251-3/+3
| | | | | | | | | | | | | 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>
* Introduce QmakeAndroidSupport pluginDaniel Teske2014-07-241-0/+193
Holds androd + qmake related classes Change-Id: Ib6bbc9c77a2b5f014573a1aa343dff5741abdb26 Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
View Lorry Controller Status