Eike Ziller fa227a4eef Merge remote-tracking branch 'origin/3.6' ...

Conflicts:
	src/libs/qmldebug/qmldebugclient.cpp
	src/libs/qmldebug/qmldebugclient.h
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: I9594b4e9befc78f8138deb121f0bfc4212f7edbf

2015-11-26 13:01:20 +01:00

..

images

Android Settings: Download buttons for Android Toolkit parts

2014-02-18 20:40:03 +01:00

addnewavddialog.ui

Android: Allow creating a avd without a sdcard

2015-04-14 13:34:45 +00:00

android_dependencies.pri

Remove aggregation dependency from project files

2015-03-09 14:25:34 +00: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.mimetypes.xml

Use new mime database

2015-02-17 13:00:07 +00: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

Use new mime database

2015-02-17 13:00:07 +00:00

androidanalyzesupport.cpp

ProjectExplorer: Use Core::Id as RunMode "enum values"

2015-06-30 06:20:54 +00:00

androidanalyzesupport.h

ProjectExplorer: Use Core::Id as RunMode "enum values"

2015-06-30 06:20:54 +00:00

androidbuildapkstep.cpp

BuildManager: Provide context of earlier build steps to init

2015-11-16 14:04:59 +00:00

androidbuildapkstep.h

BuildManager: Provide context of earlier build steps to init

2015-11-16 14:04:59 +00:00

androidbuildapkwidget.cpp

Themed Icons: Introduce Utils::Icon

2015-11-25 12:30:52 +00:00

androidbuildapkwidget.h

Update License

2015-01-16 12:37:56 +01:00

androidbuildapkwidget.ui

Icon refresh: First step towards the new Qt Creator themes

2015-10-23 16:04:52 +00:00

androidconfigurations.cpp

ToolChainManager: Refactor toolchain restoration

2015-10-27 12:16:16 +00:00

androidconfigurations.h

Android: Clean up AndroidDeviceInfo

2015-11-17 10:05:06 +00:00

androidconstants.h

Android: Compare typeId() to the correct constant

2015-07-15 15:55:22 +00: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: Allow for longer keystore alias names

2015-11-26 10:11:47 +00:00

androiddebugsupport.cpp

Debugger: Continue DebuggerStartParameter cleanup

2015-06-26 18:14:57 +00:00

androiddebugsupport.h

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

androiddeployconfiguration.cpp

ProjectConfiguration: Clean up some constants

2015-11-16 14:04:40 +00:00

androiddeployconfiguration.h

ProjectConfiguration: Clean up some constants

2015-11-16 14:04:40 +00:00

androiddeployqtstep.cpp

AndroidDeployQtStep: Keep data requested from user around

2015-11-17 12:11:42 +00:00

androiddeployqtstep.h

AndroidDeployQtStep: Keep data requested from user around

2015-11-17 12:11:42 +00: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

Fix i18n problems

2015-07-23 19:19:06 +00:00

androiddevicedialog.h

AndroidDeviceDialog: Move default device selection into Dialog

2015-05-18 09:35:30 +00:00

androiddevicedialog.ui

AndroidDeviceDialog: Move default device selection into Dialog

2015-05-18 09:35:30 +00: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

Android: Compare typeId() to the correct constant

2015-07-15 15:55:22 +00: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

Android: Remove unused constants

2015-08-31 12:16:17 +00:00

androidmanager.h

Clean exported headers of the Remote Linux, Android plugins.

2015-03-05 11:05:17 +00:00

androidmanifestdocument.cpp

Clean exported headers of the Core plugin.

2015-03-05 07:18:14 +00:00

androidmanifestdocument.h

Add override to IDocument hierarchy

2015-06-11 09:32:18 +00:00

androidmanifesteditor.cpp

Move "open" from IEditor to IDocument

2015-06-10 11:21:17 +00:00

androidmanifesteditor.h

Move "open" from IEditor to IDocument

2015-06-10 11:21:17 +00: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

Themed Icons: Introduce Utils::Icon

2015-11-25 12:30:52 +00:00

androidmanifesteditorwidget.h

Move "open" from IEditor to IDocument

2015-06-10 11:21:17 +00:00

androidplugin.cpp

Use new mime database

2015-02-17 13:00:07 +00:00

androidplugin.h

Update License

2015-01-16 12:37:56 +01:00

androidpotentialkit.cpp

Themed Icons: Introduce Utils::Icon

2015-11-25 12:30:52 +00:00

androidpotentialkit.h

Update License

2015-01-16 12:37:56 +01:00

androidqtsupport.cpp

Android: Fix opening of package location on Windows

2015-08-03 07:54:48 +00:00

androidqtsupport.h

Clean exported headers of the Remote Linux, Android plugins.

2015-03-05 11:05:17 +00:00

androidqtversion.cpp

Android: Set correct ANDROID_NDK_PLATFORM

2015-02-13 15:35:35 +00:00

androidqtversion.h

Update License

2015-01-16 12:37:56 +01:00

androidqtversionfactory.cpp

Do not create a QFileInfo via Utils::FileName::toString()

2015-11-03 11:03:42 +00: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

ProjectConfiguration: Sprinkle override and explicit over the code

2015-11-16 10:14:32 +00:00

androidruncontrol.cpp

Themed Icons: Introduce Utils::Icon

2015-11-25 12:30:52 +00:00

androidruncontrol.h

Android M: Support new logcat output

2015-06-25 09:41:26 +00:00

androidrunfactories.cpp

ProjectExplorer: Use Core::Id as RunMode "enum values"

2015-06-30 06:20:54 +00:00

androidrunfactories.h

ProjectExplorer: Use Core::Id as RunMode "enum values"

2015-06-30 06:20:54 +00:00

androidrunner.cpp

Merge remote-tracking branch 'origin/3.5'

2015-09-25 10:35:42 +02:00

androidrunner.h

Merge remote-tracking branch 'origin/3.5'

2015-09-25 10:35:42 +02: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 remote-tracking branch 'origin/3.6'

2015-11-26 13:01:20 +01:00

androidsettingswidget.h

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

androidsettingswidget.ui

Icon refresh: First step towards the new Qt Creator themes

2015-10-23 16:04:52 +00:00

androidsignaloperation.cpp

ProcessExplorer: Use 64-bit PIDs in DeviceProcessSignalOperation

2015-09-16 11:06:41 +00:00

androidsignaloperation.h

ProcessExplorer: Use 64-bit PIDs in DeviceProcessSignalOperation

2015-09-16 11:06:41 +00:00

androidtoolchain.cpp

Merge remote-tracking branch 'origin/3.6'

2015-11-26 13:01:20 +01:00

androidtoolchain.h

Consistently use Utils::FileNameList

2015-11-16 08:33:02 +00:00

avddialog.cpp

Themed Icons: Introduce Utils::Icon

2015-11-25 12:30:52 +00:00

avddialog.h

Android Avd Dialog: Fix what the Name validator accepts

2015-05-15 14:22:33 +00: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

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

Clean exported headers of the TextEditor plugin.

2015-02-26 13:15:29 +00:00

javacompletionassistprovider.h

Update License

2015-01-16 12:37:56 +01:00

javaeditor.cpp

Add override to IDocument hierarchy

2015-06-11 09:32:18 +00: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

Tasks: Make the linking of compile output to Tasks more robust

2015-04-21 13:42:03 +00:00

javaparser.h

Update License

2015-01-16 12:37:56 +01:00