feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
c4e51e7405200272fd349dc18d16f911bdc34f06
qt-creator/src/plugins/android
History
Eike Ziller c4e51e7405 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I926bdfc7df6158207cfc07f3c6c591d0a59b7667
2014-08-19 12:34:58 +02: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
AndroidDebugSupport: Split up into general and qmake specific part
2014-07-21 12:41:14 +02:00
Android.pluginspec.in
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
android.pro
Move qmake specific part to qmake plugin, generalize android support
2014-07-21 12:41:28 +02:00
android.qbs
Move qmake specific part to qmake plugin, generalize android support
2014-07-21 12:41:28 +02:00
android.qrc
Android Settings: Download buttons for Android Toolkit parts
2014-02-18 20:40:03 +01:00
androidanalyzesupport.cpp
Project: Use Utils::FileName as return type for projectDirectory(...)
2014-05-06 11:48:10 +02:00
androidanalyzesupport.h
Move qmake specific part to qmake plugin, generalize android support
2014-07-21 12:41:28 +02:00
androidbuildapkstep.cpp
Android: Check if DebugDeployment is usable.
2014-08-01 12:19:30 +02:00
androidbuildapkstep.h
Move qmake specific part to qmake plugin, generalize android support
2014-07-21 12:41:28 +02:00
androidbuildapkwidget.cpp
Disable signing when using debug deployment method.
2014-07-22 13:30:04 +02:00
androidbuildapkwidget.h
Disable signing when using debug deployment method.
2014-07-22 13:30:04 +02:00
androidbuildapkwidget.ui
Disable signing when using debug deployment method.
2014-07-22 13:30:04 +02:00
androidconfigurations.cpp
Kit: Introduce variables for Kit display names
2014-08-18 17:17:50 +02:00
androidconfigurations.h
Move qmake specific part to qmake plugin, generalize android support
2014-07-21 12:41:28 +02:00
androidconstants.h
Move qmake specific part to qmake plugin, generalize android support
2014-07-21 12:41:28 +02:00
androidcreatekeystorecertificate.cpp
Android: Rework settings dialog
2014-01-17 13:01:22 +01:00
androidcreatekeystorecertificate.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
androidcreatekeystorecertificate.ui
Android: Improve the Keystore and Certificate dialog.
2013-09-02 12:13:07 +02:00
androiddebugsupport.cpp
AndroidDebugSupport: Split up into general and qmake specific part
2014-07-21 12:41:14 +02:00
androiddebugsupport.h
Move qmake specific part to qmake plugin, generalize android support
2014-07-21 12:41:28 +02:00
androiddeployconfiguration.cpp
Move qmake specific part to qmake plugin, generalize android support
2014-07-21 12:41:28 +02:00
androiddeployconfiguration.h
Android: Remove Necessitas support
2014-07-21 12:40:55 +02:00
androiddeployqtstep.cpp
Use androiddeployqt to install the package when using Qt >= 5.4
2014-08-08 19:33:15 +02:00
androiddeployqtstep.h
Use androiddeployqt to install the package when using Qt >= 5.4
2014-08-08 19:33:15 +02:00
androiddeployqtwidget.cpp
Move qmake specific part to qmake plugin, generalize android support
2014-07-21 12:41:28 +02:00
androiddeployqtwidget.h
Move qmake specific part to qmake plugin, generalize android support
2014-07-21 12:41:28 +02:00
androiddeployqtwidget.ui
Move qmake specific part to qmake plugin, generalize android support
2014-07-21 12:41:28 +02:00
androiddevice.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
androiddevice.h
Move qmake specific part to qmake plugin, generalize android support
2014-07-21 12:41:28 +02:00
androiddevicedialog.cpp
Android: Fix blocking the ui on adding an avd
2014-05-08 11:03:38 +02:00
androiddevicedialog.h
Android: Fix blocking the ui on adding an avd
2014-05-08 11:03:38 +02:00
androiddevicedialog.ui
Improve translated messages in Android device dialog.
2014-03-19 11:14:13 +01:00
androiddevicefactory.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
androiddevicefactory.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
androiderrormessage.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
androiderrormessage.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
androidgdbserverkitinformation.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
androidgdbserverkitinformation.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
androidglobal.h
Use androiddeployqt to install the package when using Qt >= 5.4
2014-08-08 19:33:15 +02:00
androidmanager.cpp
Android: Remove unused variable
2014-07-24 11:18:25 +02:00
androidmanager.h
AndroidManager: Move private static functions to implementation
2014-07-22 14:49:07 +02:00
androidmanifestdocument.cpp
TextEditor: Update tab settings for all tab changes
2014-07-30 16:21:43 +02:00
androidmanifestdocument.h
TextEditor: Replace PlainTextDocument by Base + a setup function
2014-07-30 15:17:50 +02:00
androidmanifesteditor.cpp
TextEditor: Consolidate document access functions.
2014-08-04 10:43:56 +02:00
androidmanifesteditor.h
Android: Fix warning about hidding overloaded virtual method
2014-05-12 10:53:16 +02:00
androidmanifesteditorfactory.cpp
AndroidManifestEditor: Fix widget hierarchy
2014-01-15 13:59:47 +01:00
androidmanifesteditorfactory.h
Editors: Remove useless parent widget argument from create/duplicate
2014-01-08 11:46:11 +01:00
androidmanifesteditorwidget.cpp
TextEditor: Merge the two sets of *EditorWidget constructors
2014-08-19 09:19:33 +02:00
androidmanifesteditorwidget.h
TextEditor: Merge PlainTextEditor into Base
2014-07-30 15:17:53 +02:00
androidplugin.cpp
Move qmake specific part to qmake plugin, generalize android support
2014-07-21 12:41:28 +02:00
androidplugin.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
androidpotentialkit.cpp
Set parent for options dialog where appropriate.
2014-07-14 16:24:26 +02:00
androidpotentialkit.h
Android: Add configure Android item to "Add kit" menu in projects mode
2014-02-20 12:53:08 +01:00
androidqtsupport.h
Use androiddeployqt to install the package when using Qt >= 5.4
2014-08-08 19:33:15 +02:00
androidqtversion.cpp
Move qmake specific part to qmake plugin, generalize android support
2014-07-21 12:41:28 +02:00
androidqtversion.h
Android: Ensure that ANDROID_NDK_ROOT is set while parsing the mkspec
2014-04-03 13:08:22 +02:00
androidqtversionfactory.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
androidqtversionfactory.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
androidrunconfiguration.cpp
AndroidRunConfigurations: Split up into general and qmake specific parts
2014-07-21 12:41:21 +02:00
androidrunconfiguration.h
AndroidRunConfigurations: Split up into general and qmake specific parts
2014-07-21 12:41:21 +02:00
androidruncontrol.cpp
Android: Remove Necessitas support
2014-07-21 12:40:55 +02:00
androidruncontrol.h
Move qmake specific part to qmake plugin, generalize android support
2014-07-21 12:41:28 +02:00
androidrunfactories.cpp
AndroidRunConfigurations: Split up into general and qmake specific parts
2014-07-21 12:41:21 +02:00
androidrunfactories.h
AndroidRunConfigurations: Split up into general and qmake specific parts
2014-07-21 12:41:21 +02:00
androidrunner.cpp
Merge remote-tracking branch 'origin/3.2'
2014-08-19 12:34:58 +02:00
androidrunner.h
Move qmake specific part to qmake plugin, generalize android support
2014-07-21 12:41:28 +02:00
androidrunsupport.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
androidrunsupport.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
androidsettingspage.cpp
AndroidSettingsWidget::apply(): Fix order of applying the changes
2014-03-11 15:40:22 +01:00
androidsettingspage.h
Merge remote-tracking branch 'origin/3.0'
2014-01-08 11:01:06 +01:00
androidsettingswidget.cpp
Android: Fix link to fixed gdbs
2014-08-12 14:14:12 +02:00
androidsettingswidget.h
Android: Warn about broken gdbs on every platform
2014-07-29 16:25:35 +02:00
androidsettingswidget.ui
Android: Check for broken gdb on mac
2014-07-23 18:10:15 +02:00
androidsignaloperation.cpp
QString(QLatin1String()) -> QString::fromLatin1()
2014-05-09 09:03:19 +02:00
androidsignaloperation.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
androidtoolchain.cpp
ToolChain: Do not run compiler when setting up a toolchain
2014-07-21 16:40:44 +02:00
androidtoolchain.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
avddialog.cpp
Android: apply UI text guidelines to messages
2014-07-18 09:06:59 +02:00
avddialog.h
Move qmake specific part to qmake plugin, generalize android support
2014-07-21 12:41:28 +02:00
certificatesmodel.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
certificatesmodel.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
Java.mimetypes.xml
Android: Add minimal Java editing support
2014-01-20 14:57:04 +01:00
javaautocompleter.cpp
Android: Fix build with MSVC.
2014-01-21 10:24:44 +01:00
javaautocompleter.h
Android: Add minimal Java editing support
2014-01-20 14:57:04 +01:00
javacompletionassistprovider.cpp
Always pass Core::Id by value.
2014-07-01 11:52:08 +02:00
javacompletionassistprovider.h
Always pass Core::Id by value.
2014-07-01 11:52:08 +02:00
javaeditor.cpp
TextEditor: Further *Editor/*EditorWidget disentangling
2014-08-19 10:32:12 +02:00
javaeditor.h
TextEditor: Further *Editor/*EditorWidget disentangling
2014-08-19 10:32:12 +02:00
javaeditorfactory.cpp
TextEditor: Merge the two sets of *EditorWidget constructors
2014-08-19 09:19:33 +02:00
javaeditorfactory.h
Android: Add minimal Java editing support
2014-01-20 14:57:04 +01:00
javafilewizard.cpp
IWizardFactory: Rename BaseFileWizard to BaseFileWizardFactory
2014-06-05 10:56:27 +02:00
javafilewizard.h
IWizardFactory: Rename StandardFileWizard to StandardFileWizardFactory
2014-06-05 10:56:56 +02:00
javaindenter.cpp
Android: Add minimal Java editing support
2014-01-20 14:57:04 +01:00
javaindenter.h
Android: Add minimal Java editing support
2014-01-20 14:57:04 +01:00
javaparser.cpp
Android: JavaParser, adjust paths from build to source directory
2014-01-10 12:35:19 +01:00
javaparser.h
Android: JavaParser, adjust paths from build to source directory
2014-01-10 12:35:19 +01:00