feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
56aadc407d7becadec794e660ae7d7c20e820e0c
qt-creator/src/plugins/android
History
Eike Ziller 56aadc407d Merge remote-tracking branch 'origin/3.3' 
Conflicts:
	src/plugins/debugger/watchhandler.cpp
	src/plugins/projectexplorer/kitmodel.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/shared/qbs

Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602
2015-02-12 17:36:29 +01:00
..
images
Android Settings: Download buttons for Android Toolkit parts
2014-02-18 20:40:03 +01:00
addnewavddialog.ui
Android: Rework Create AVD dialog
2014-04-01 16:24:45 +02:00
android_dependencies.pri
Move qmake specific part to qmake plugin, generalize android support
2014-07-21 12:41:28 +02:00
android_global.h
Update License
2015-01-16 12:37:56 +01:00
Android.json.in
Update License
2015-01-16 12:37:56 +01:00
android.pro
JsonWizard: Replace Java wizard with JsonWizard
2014-09-30 17:29:08 +02:00
android.qbs
qbs build: Remove unneeded import statements.
2014-11-10 15:45:14 +01:00
android.qrc
Android Settings: Download buttons for Android Toolkit parts
2014-02-18 20:40:03 +01:00
androidanalyzesupport.cpp
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
androidanalyzesupport.h
Update License
2015-01-16 12:37:56 +01:00
androidbuildapkstep.cpp
Update License
2015-01-16 12:37:56 +01:00
androidbuildapkstep.h
Update License
2015-01-16 12:37:56 +01:00
androidbuildapkwidget.cpp
Update License
2015-01-16 12:37:56 +01:00
androidbuildapkwidget.h
Update License
2015-01-16 12:37:56 +01:00
androidbuildapkwidget.ui
String improvements
2015-01-06 11:50:19 +01:00
androidconfigurations.cpp
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
androidconfigurations.h
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
androidconstants.h
Update License
2015-01-16 12:37:56 +01:00
androidcreatekeystorecertificate.cpp
Update License
2015-01-16 12:37:56 +01:00
androidcreatekeystorecertificate.h
Update License
2015-01-16 12:37:56 +01:00
androidcreatekeystorecertificate.ui
Android: Improve the Keystore and Certificate dialog.
2013-09-02 12:13:07 +02:00
androiddebugsupport.cpp
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
androiddebugsupport.h
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
androiddeployconfiguration.cpp
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
androiddeployconfiguration.h
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
androiddeployqtstep.cpp
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
androiddeployqtstep.h
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
androiddeployqtwidget.cpp
Update License
2015-01-16 12:37:56 +01:00
androiddeployqtwidget.h
Update License
2015-01-16 12:37:56 +01:00
androiddeployqtwidget.ui
Move qmake specific part to qmake plugin, generalize android support
2014-07-21 12:41:28 +02:00
androiddevice.cpp
Update License
2015-01-16 12:37:56 +01:00
androiddevice.h
Update License
2015-01-16 12:37:56 +01:00
androiddevicedialog.cpp
Update License
2015-01-16 12:37:56 +01:00
androiddevicedialog.h
Update License
2015-01-16 12:37:56 +01:00
androiddevicedialog.ui
Improve translated messages in Android device dialog.
2014-03-19 11:14:13 +01:00
androiddevicefactory.cpp
Update License
2015-01-16 12:37:56 +01:00
androiddevicefactory.h
Update License
2015-01-16 12:37:56 +01:00
androiderrormessage.cpp
Update License
2015-01-16 12:37:56 +01:00
androiderrormessage.h
Update License
2015-01-16 12:37:56 +01:00
androidgdbserverkitinformation.cpp
Update License
2015-01-16 12:37:56 +01:00
androidgdbserverkitinformation.h
Update License
2015-01-16 12:37:56 +01:00
androidglobal.h
Update License
2015-01-16 12:37:56 +01:00
androidmanager.cpp
Update License
2015-01-16 12:37:56 +01:00
androidmanager.h
Update License
2015-01-16 12:37:56 +01:00
androidmanifestdocument.cpp
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
androidmanifestdocument.h
Update License
2015-01-16 12:37:56 +01:00
androidmanifesteditor.cpp
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
androidmanifesteditor.h
Update License
2015-01-16 12:37:56 +01:00
androidmanifesteditorfactory.cpp
Update License
2015-01-16 12:37:56 +01:00
androidmanifesteditorfactory.h
Update License
2015-01-16 12:37:56 +01:00
androidmanifesteditorwidget.cpp
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
androidmanifesteditorwidget.h
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
androidplugin.cpp
Update License
2015-01-16 12:37:56 +01:00
androidplugin.h
Update License
2015-01-16 12:37:56 +01:00
androidpotentialkit.cpp
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
androidpotentialkit.h
Update License
2015-01-16 12:37:56 +01:00
androidqtsupport.cpp
Update License
2015-01-16 12:37:56 +01:00
androidqtsupport.h
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
androidqtversion.cpp
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
androidqtversion.h
Update License
2015-01-16 12:37:56 +01:00
androidqtversionfactory.cpp
Update License
2015-01-16 12:37:56 +01:00
androidqtversionfactory.h
Update License
2015-01-16 12:37:56 +01:00
androidrunconfiguration.cpp
Update License
2015-01-16 12:37:56 +01:00
androidrunconfiguration.h
Update License
2015-01-16 12:37:56 +01:00
androidruncontrol.cpp
Update License
2015-01-16 12:37:56 +01:00
androidruncontrol.h
Update License
2015-01-16 12:37:56 +01:00
androidrunfactories.cpp
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
androidrunfactories.h
Update License
2015-01-16 12:37:56 +01:00
androidrunner.cpp
Android: Fix debugging applications that link many modules
2015-02-11 11:05:53 +00:00
androidrunner.h
Update License
2015-01-16 12:37:56 +01:00
androidsettingspage.cpp
Update License
2015-01-16 12:37:56 +01:00
androidsettingspage.h
Update License
2015-01-16 12:37:56 +01:00
androidsettingswidget.cpp
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
androidsettingswidget.h
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
androidsettingswidget.ui
Android: Reduce time to open settings widget
2015-01-13 11:11:52 +01:00
androidsignaloperation.cpp
Update License
2015-01-16 12:37:56 +01:00
androidsignaloperation.h
Update License
2015-01-16 12:37:56 +01:00
androidtoolchain.cpp
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
androidtoolchain.h
Update License
2015-01-16 12:37:56 +01:00
avddialog.cpp
Update License
2015-01-16 12:37:56 +01:00
avddialog.h
Update License
2015-01-16 12:37:56 +01:00
certificatesmodel.cpp
Update License
2015-01-16 12:37:56 +01:00
certificatesmodel.h
Update License
2015-01-16 12:37:56 +01:00
Java.mimetypes.xml
Android: Add minimal Java editing support
2014-01-20 14:57:04 +01:00
javaautocompleter.cpp
Update License
2015-01-16 12:37:56 +01:00
javaautocompleter.h
Update License
2015-01-16 12:37:56 +01:00
javacompletionassistprovider.cpp
Update License
2015-01-16 12:37:56 +01:00
javacompletionassistprovider.h
Update License
2015-01-16 12:37:56 +01:00
javaeditor.cpp
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
javaeditor.h
Update License
2015-01-16 12:37:56 +01:00
javaindenter.cpp
Update License
2015-01-16 12:37:56 +01:00
javaindenter.h
Update License
2015-01-16 12:37:56 +01:00
javaparser.cpp
Update License
2015-01-16 12:37:56 +01:00
javaparser.h
Update License
2015-01-16 12:37:56 +01:00