Oswald Buddenhagen c2e90c360b Merge remote-tracking branch 'origin/2.8' ...

Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/projectexplorer/customtoolchain.cpp
	src/plugins/vcsbase/command.cpp

Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48

2013-08-21 14:39:18 +02:00

..

images

ScriptConsole: Move from Debugger to QmlJSTools

2012-10-05 11:03:01 +02:00

qmlconsoleedit.cpp

Clean headers in QmlJsTools.

2013-04-03 11:35:02 +02:00

qmlconsoleedit.h

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

qmlconsoleitemdelegate.cpp

Merge remote-tracking branch 'origin/2.7' into 2.8

2013-06-05 11:14:48 +02:00

qmlconsoleitemdelegate.h

Clean headers in QmlJsTools.

2013-04-03 11:35:02 +02:00

qmlconsoleitemmodel.cpp

Clean headers in QmlJsTools.

2013-04-03 11:35:02 +02:00

qmlconsoleitemmodel.h

QmlConsoleItemModel: Remove redundant method

2013-08-12 13:36:31 +02:00

qmlconsolemanager.cpp

Incremented year in copyright info

2013-02-01 09:19:26 +01:00

qmlconsolemanager.h

Incremented year in copyright info

2013-02-01 09:19:26 +01:00

qmlconsolemodel.h

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

qmlconsolepane.cpp

Normalized connect()s

2013-05-16 13:55:14 +02:00

qmlconsolepane.h

Incremented year in copyright info

2013-02-01 09:19:26 +01:00

qmlconsoleproxymodel.cpp

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

qmlconsoleproxymodel.h

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

qmlconsoleview.cpp

Fix coding style for else statements

2013-07-17 11:11:25 +02:00

qmlconsoleview.h

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

qmljsbundleprovider.cpp

Doc: use standard wording in \brief commands

2013-06-20 11:22:47 +02:00

qmljsbundleprovider.h

Forward-declare some classes in QmlJsTools.

2013-04-03 11:20:41 +02:00

qmljscodestylepreferencesfactory.cpp

Clean headers in QmlJsTools.

2013-04-03 11:35:02 +02:00

qmljscodestylepreferencesfactory.h

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

qmljscodestylesettingspage.cpp

Settings: Simplify some user code

2013-05-29 09:40:17 +02:00

qmljscodestylesettingspage.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

qmljscodestylesettingspage.ui

Implement Code Style schemes

2011-09-23 10:23:15 +02:00

qmljsfindexportedcpptypes.cpp

Fix coding style for else statements

2013-07-17 11:11:25 +02:00

qmljsfindexportedcpptypes.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

qmljsfunctionfilter.cpp

Switch less often to edit mode

2013-06-05 09:43:14 +02:00

qmljsfunctionfilter.h

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

qmljsindenter.cpp

Clean headers in QmlJsTools.

2013-04-03 11:35:02 +02:00

qmljsindenter.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

qmljsinterpreter.cpp

Incremented year in copyright info

2013-02-01 09:19:26 +01:00

qmljsinterpreter.h

Incremented year in copyright info

2013-02-01 09:19:26 +01:00

qmljslocatordata.cpp

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

qmljslocatordata.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

qmljsmodelmanager.cpp

Merge remote-tracking branch 'origin/2.8'

2013-08-21 14:39:18 +02:00

qmljsmodelmanager.h

qmljs: coalesce resets of code model triggered by cpp files update

2013-07-02 12:11:58 +02:00

qmljsplugindumper.cpp

TypeDescriptionReader: Check for files that are not UTF8 encoded

2013-05-15 11:21:44 +02:00

qmljsplugindumper.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

qmljsqtstylecodeformatter.cpp

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

qmljsqtstylecodeformatter.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

qmljsrefactoringchanges.cpp

Clean headers in QmlJsTools.

2013-04-03 11:35:02 +02:00

qmljsrefactoringchanges.h

Fix Krazy warnings about includes/header guards in QML-JS-code.

2013-03-12 16:19:06 +01:00

qmljssemanticinfo.cpp

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

qmljssemanticinfo.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

qmljstools_dependencies.pri

Fix dependency information according to output of dependency checker

2013-05-22 16:41:39 +02:00

qmljstools_global.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

qmljstools_test.cpp

Clean headers in QmlJsTools.

2013-04-03 11:35:02 +02:00

QmlJSTools.mimetypes.xml

qmljs: moving all mime types into qmljstools

2013-05-30 15:45:26 +02:00

QmlJSTools.pluginspec.in

Add QTCREATOR_COMPAT_VERSION

2013-07-09 15:14:10 +02:00

qmljstools.pro

qmljs: moving all mime types into qmljstools

2013-05-30 15:45:26 +02:00

qmljstools.qbs

Consistently give qbs groups a name.

2013-06-06 13:40:51 +02:00

qmljstools.qrc

qmljs: moving all mime types into qmljstools

2013-05-30 15:45:26 +02:00

qmljstoolsconstants.h

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

qmljstoolsplugin.cpp

qmljs: moving all mime types into qmljstools

2013-05-30 15:45:26 +02:00

qmljstoolsplugin.h

Clean headers in QmlJsTools.

2013-04-03 11:35:02 +02:00

qmljstoolssettings.cpp

Avoid crash on qmljs plugin unload

2013-03-12 16:22:12 +01:00

qmljstoolssettings.h

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00