Eike Ziller a47fbb8309 Merge remote-tracking branch 'origin/3.3' ...

Conflicts:
	src/plugins/coreplugin/coreplugin.cpp
	src/plugins/coreplugin/themesettingswidget.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.h
	src/plugins/qmlprofiler/qml/Overview.js
	src/shared/qbs

Change-Id: Ibe92c166fc5bfbcb4d6964e50ca7298d8459d60e

2014-11-24 15:43:48 +01:00

..

cmakebuildconfiguration.cpp

Move uses of ProjectMacroExpander closer to build configuration

2014-10-22 10:21:46 +02:00

cmakebuildconfiguration.h

Merge remote-tracking branch 'origin/3.2'

2014-10-14 15:36:16 +02:00

cmakebuildinfo.h

License update

2014-10-09 11:41:44 +02:00

cmakeeditor.cpp

Use QFileInfo::exist(f) instead of QFileInfo(f).exists() if possible

2014-11-03 09:31:28 +01:00

cmakeeditor.h

Merge remote-tracking branch 'origin/3.2'

2014-10-14 15:36:16 +02:00

cmakefilecompletionassist.cpp

Merge remote-tracking branch 'origin/3.2'

2014-10-14 15:36:16 +02:00

cmakefilecompletionassist.h

License update

2014-10-09 11:41:44 +02:00

cmakelocatorfilter.cpp

Merge remote-tracking branch 'origin/3.2'

2014-10-14 15:36:16 +02:00

cmakelocatorfilter.h

Merge remote-tracking branch 'origin/3.2'

2014-10-14 15:36:16 +02:00

cmakeopenprojectwizard.cpp

Use QFileInfo::exist(f) instead of QFileInfo(f).exists() if possible

2014-11-03 09:31:28 +01:00

cmakeopenprojectwizard.h

License update

2014-10-09 11:41:44 +02:00

cmakeparser.cpp

License update

2014-10-09 11:41:44 +02:00

cmakeparser.h

License update

2014-10-09 11:41:44 +02:00

cmakeproject.cpp

Merge remote-tracking branch 'origin/3.3'

2014-11-24 15:43:48 +01:00

cmakeproject.h

don't deploy static libraries build using cmake

2014-11-07 12:28:14 +01:00

cmakeproject.qrc

Streamline mimetypes.xml files

2013-06-07 16:23:19 +02:00

cmakeprojectconstants.h

Merge remote-tracking branch 'origin/3.2'

2014-10-14 15:36:16 +02:00

cmakeprojectmanager_dependencies.pri

Qbs/qmake: Fix dependencies of plugins

2014-02-11 13:23:26 +01:00

cmakeprojectmanager.cpp

Merge remote-tracking branch 'origin/3.2'

2014-10-14 15:36:16 +02:00

cmakeprojectmanager.h

Merge remote-tracking branch 'origin/3.2'

2014-10-14 15:36:16 +02:00

CMakeProjectManager.json.in

License update.

2014-10-15 15:19:55 +02:00

CMakeProjectManager.mimetypes.xml

CMakeProject: Make CMakeLists.txt and *.cmake use different mime types

2014-07-17 16:38:30 +02:00

cmakeprojectmanager.pro

CMakeProjectManager: General editor related code consolidation

2014-08-20 15:52:47 +02:00

cmakeprojectmanager.qbs

qbs build: Remove unneeded import statements.

2014-11-10 15:45:14 +01:00

cmakeprojectnodes.cpp

License update

2014-10-09 11:41:44 +02:00

cmakeprojectnodes.h

License update

2014-10-09 11:41:44 +02:00

cmakeprojectplugin.cpp

Merge remote-tracking branch 'origin/3.2'

2014-10-14 15:36:16 +02:00

cmakeprojectplugin.h

License update

2014-10-09 11:41:44 +02:00

cmakerunconfiguration.cpp

Utils: MacroExpander API cosmetics.

2014-10-22 10:21:21 +02:00

cmakerunconfiguration.h

License update

2014-10-09 11:41:44 +02:00

cmakesettingspage.cpp

Merge remote-tracking branch 'origin/3.2'

2014-10-14 15:36:16 +02:00

cmakesettingspage.h

License update

2014-10-09 11:41:44 +02:00

cmaketool.cpp

Merge remote-tracking branch 'origin/3.2'

2014-10-14 15:36:16 +02:00

cmaketool.h

License update

2014-10-09 11:41:44 +02:00

generatorinfo.cpp

Merge remote-tracking branch 'origin/3.2'

2014-10-14 15:36:16 +02:00

generatorinfo.h

License update

2014-10-09 11:41:44 +02:00

makestep.cpp

Merge remote-tracking branch 'origin/3.2'

2014-10-14 15:36:16 +02:00

makestep.h

Merge remote-tracking branch 'origin/3.2'

2014-10-14 15:36:16 +02:00