Eike Ziller fe74a9a722 Merge remote-tracking branch 'origin/2.6' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/cxx11/cxx11.pro
	tests/auto/cplusplus/cxx11/tst_cxx11.cpp
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I3c8351ad35617f56d15b788c8a46d8a6f453ef70

2012-11-09 11:20:10 +01:00

..

cmakebuildconfiguration.cpp

Kit: Add createOutputParser method

2012-11-02 14:49:34 +01:00

cmakebuildconfiguration.h

Kit: Add createOutputParser method

2012-11-02 14:49:34 +01:00

cmakeeditor.cpp

Adjust license headers

2012-10-05 17:12:56 +02:00

cmakeeditor.h

Adjust license headers

2012-10-05 17:12:56 +02:00

cmakeeditorfactory.cpp

Adjust license headers

2012-10-05 17:12:56 +02:00

cmakeeditorfactory.h

Adjust license headers

2012-10-05 17:12:56 +02:00

cmakefilecompletionassist.cpp

CMake: add auto completion for cmake editor

2012-10-25 12:25:20 +02:00

cmakefilecompletionassist.h

CMake: add auto completion for cmake editor

2012-10-25 12:25:20 +02:00

cmakehighlighter.cpp

Adjust license headers

2012-10-05 17:12:56 +02:00

cmakehighlighter.h

Adjust license headers

2012-10-05 17:12:56 +02:00

cmakelocatorfilter.cpp

Merge remote-tracking branch 'origin/2.6'

2012-10-05 21:20:50 +02:00

cmakelocatorfilter.h

Adjust license headers

2012-10-05 17:12:56 +02:00

cmakeopenprojectwizard.cpp

Merge remote-tracking branch 'origin/2.6'

2012-11-09 11:20:10 +01:00

cmakeopenprojectwizard.h

CMakeOpenProjectWizard: Add page asking for cmake executable

2012-10-16 16:45:51 +02:00

cmakeproject.cpp

Merge remote-tracking branch 'origin/2.6'

2012-10-18 10:40:11 +02:00

cmakeproject.h

CMake: Reparse .cbp files on swtiching targets

2012-10-16 18:01:31 +02:00

CMakeProject.mimetypes.xml

Add *.cmake to glob patterns for cmake files.

2010-03-23 16:25:46 +01:00

cmakeproject.qrc

Add a locator to compile a specific cmake target

2011-10-27 12:16:47 +02:00

cmakeprojectconstants.h

Adjust license headers

2012-10-05 17:12:56 +02:00

cmakeprojectmanager_dependencies.pri

DebuggingHelper: Move to QtSupport

2012-05-18 15:48:26 +02:00

cmakeprojectmanager.cpp

CMake: add auto completion for cmake editor

2012-10-25 12:25:20 +02:00

cmakeprojectmanager.h

CMake: add auto completion for cmake editor

2012-10-25 12:25:20 +02:00

CMakeProjectManager.pluginspec.in

Adjust license headers

2012-10-05 17:12:56 +02:00

cmakeprojectmanager.pro

CMake: add auto completion for cmake editor

2012-10-25 12:25:20 +02:00

cmakeprojectmanager.qbs

CMake: add auto completion for cmake editor

2012-10-25 12:25:20 +02:00

cmakeprojectnodes.cpp

Adjust license headers

2012-10-05 17:12:56 +02:00

cmakeprojectnodes.h

Adjust license headers

2012-10-05 17:12:56 +02:00

cmakeprojectplugin.cpp

CMake: add auto completion for cmake editor

2012-10-25 12:25:20 +02:00

cmakeprojectplugin.h

Adjust license headers

2012-10-05 17:12:56 +02:00

cmakerunconfiguration.cpp

Adjust license headers

2012-10-05 17:12:56 +02:00

cmakerunconfiguration.h

Remove useless CMakeBuildConfiguration fwd-declaration

2012-11-07 13:24:17 +01:00

cmakeuicodemodelsupport.cpp

Adjust license headers

2012-10-05 17:12:56 +02:00

cmakeuicodemodelsupport.h

Adjust license headers

2012-10-05 17:12:56 +02:00

cmakevalidator.cpp

CMake: add auto completion for cmake editor

2012-10-25 12:25:20 +02:00

cmakevalidator.h

CMake: add auto completion for cmake editor

2012-10-25 12:25:20 +02:00

makestep.cpp

Kit: Add createOutputParser method

2012-11-02 14:49:34 +01:00

makestep.h

Adjust license headers

2012-10-05 17:12:56 +02:00