Oswald Buddenhagen 1fda2111d4 Merge remote-tracking branch 'origin/2.6' ...

Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104

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

..

images

QmlOutline: Show functions in outline

2010-09-28 09:25:06 +02:00

parser

Merge remote-tracking branch 'origin/2.6'

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

consoleitem.cpp

Debugger: Remove the dependence on QmlJSTools

2012-10-09 18:22:00 +02:00

consoleitem.h

Merge remote-tracking branch 'origin/2.6'

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

consolemanagerinterface.cpp

Merge remote-tracking branch 'origin/2.6'

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

consolemanagerinterface.h

Debugger: Remove the dependence on QmlJSTools

2012-10-09 18:22:00 +02:00

iscriptevaluator.h

Merge remote-tracking branch 'origin/2.6'

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

jsoncheck.cpp

Incremented year in copyright info

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

jsoncheck.h

Incremented year in copyright info

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

persistenttrie.cpp

qmljs: added persistent trie

2012-12-06 12:57:48 +01:00

persistenttrie.h

Compile fix

2012-12-06 17:34:58 +01:00

qmljs_global.h

Incremented year in copyright info

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

qmljs-lib.pri

qmljs: added persistent trie

2012-12-06 12:57:48 +01:00

qmljs.pri

Avoid adding the same DEFINE multiple times to the command line

2012-08-21 11:57:22 +02:00

qmljs.pro

Generalize QT_NO_CAST_FROM_ASCII

2013-01-16 01:14:08 +01:00

qmljs.qbs

Generalize QT_NO_CAST_FROM_ASCII

2013-01-16 01:14:08 +01:00

qmljs.qrc

QmlOutline: Show functions in outline

2010-09-28 09:25:06 +02:00

qmljsbind.cpp

Incremented year in copyright info

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

qmljsbind.h

Incremented year in copyright info

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

qmljscheck.cpp

Merge remote-tracking branch 'origin/2.6'

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

qmljscheck.h

Merge remote-tracking branch 'origin/2.6'

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

qmljscodeformatter.cpp

Merge remote-tracking branch 'origin/2.6'

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

qmljscodeformatter.h

Merge remote-tracking branch 'origin/2.6'

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

qmljscompletioncontextfinder.cpp

Merge remote-tracking branch 'origin/2.6'

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

qmljscompletioncontextfinder.h

Incremented year in copyright info

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

qmljscontext.cpp

Incremented year in copyright info

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

qmljscontext.h

Incremented year in copyright info

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

qmljsdelta.cpp

Merge remote-tracking branch 'origin/2.6'

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

qmljsdelta.h

Incremented year in copyright info

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

qmljsdocument.cpp

Merge remote-tracking branch 'origin/2.6'

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

qmljsdocument.h

Merge remote-tracking branch 'origin/2.6'

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

qmljsevaluate.cpp

Merge remote-tracking branch 'origin/2.6'

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

qmljsevaluate.h

Incremented year in copyright info

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

qmljsicons.cpp

Merge remote-tracking branch 'origin/2.6'

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

qmljsicons.h

Incremented year in copyright info

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

qmljsicontextpane.h

Incremented year in copyright info

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

qmljsindenter.cpp

Merge remote-tracking branch 'origin/2.6'

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

qmljsindenter.h

Incremented year in copyright info

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

qmljsinterpreter.cpp

Merge remote-tracking branch 'origin/2.6'

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

qmljsinterpreter.h

Merge remote-tracking branch 'origin/2.6'

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

qmljslineinfo.cpp

Merge remote-tracking branch 'origin/2.6'

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

qmljslineinfo.h

Incremented year in copyright info

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

qmljslink.cpp

Merge remote-tracking branch 'origin/2.6'

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

qmljslink.h

Incremented year in copyright info

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

qmljsmodelmanagerinterface.cpp

Incremented year in copyright info

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

qmljsmodelmanagerinterface.h

Incremented year in copyright info

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

qmljspropertyreader.cpp

Merge remote-tracking branch 'origin/2.6'

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

qmljspropertyreader.h

Incremented year in copyright info

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

qmljsreformatter.cpp

Merge remote-tracking branch 'origin/2.6'

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

qmljsreformatter.h

Incremented year in copyright info

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

qmljsrewriter.cpp

Merge remote-tracking branch 'origin/2.6'

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

qmljsrewriter.h

Incremented year in copyright info

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

qmljsscanner.cpp

Incremented year in copyright info

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

qmljsscanner.h

Incremented year in copyright info

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

qmljsscopeastpath.cpp

Merge remote-tracking branch 'origin/2.6'

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

qmljsscopeastpath.h

Incremented year in copyright info

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

qmljsscopebuilder.cpp

Merge remote-tracking branch 'origin/2.6'

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

qmljsscopebuilder.h

Incremented year in copyright info

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

qmljsscopechain.cpp

Incremented year in copyright info

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

qmljsscopechain.h

Incremented year in copyright info

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

qmljssimplereader.cpp

Compile fix (QT_NO_CAST_FROM_ASCII).

2012-11-28 12:37:50 +01:00

qmljssimplereader.h

QmlJS:SimpleReader: adding support for arrays

2012-11-21 13:58:58 +01:00

qmljsstaticanalysismessage.cpp

Merge remote-tracking branch 'origin/2.6'

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

qmljsstaticanalysismessage.h

Merge remote-tracking branch 'origin/2.6'

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

qmljstypedescriptionreader.cpp

Merge remote-tracking branch 'origin/2.6'

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

qmljstypedescriptionreader.h

Incremented year in copyright info

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

qmljsutils.cpp

Incremented year in copyright info

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

qmljsutils.h

Incremented year in copyright info

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

qmljsvalueowner.cpp

Merge remote-tracking branch 'origin/2.6'

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

qmljsvalueowner.h

Incremented year in copyright info

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