con 458a25efa9 Merge remote branch 'origin/2.0' ...

Conflicts:
	doc/qt-html-templates.qdocconf
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmljseditor/qmljscodecompletion.cpp

2010-06-18 16:54:37 +02:00

..

cmakebuildconfiguration.cpp

Don't reset build directory for clone cmake buildconfigurations

2010-06-10 14:50:21 +02:00

cmakebuildconfiguration.h

Move build environment customization down to BuildConfiguration

2010-03-12 13:01:04 +01:00

cmakeeditor.cpp

Fix CMake highlighting with dark theme

2010-03-30 13:08:39 +02:00

cmakeeditor.h

Fix forward declaration

2010-03-30 14:15:04 +02:00

cmakeeditorfactory.cpp

-cmake syntax highlighting, with the help from Daniel

2010-03-30 12:11:32 +02:00

cmakeeditorfactory.h

-cmake syntax highlighting, with the help from Daniel

2010-03-30 12:11:32 +02:00

cmakehighlighter.cpp

Coding style fixes

2010-03-30 12:58:58 +02:00

cmakehighlighter.h

-add a comment what the class does

2010-03-30 12:11:33 +02:00

cmakeopenprojectwizard.cpp

Change the build directory for cmake

2010-04-12 17:39:59 +02:00

cmakeopenprojectwizard.h

Replace QWizard with Utils::Wizard

2010-03-31 15:22:14 +02:00

cmakeproject.cpp

File renaming

2010-05-12 14:14:44 +02:00

cmakeproject.h

File renaming

2010-05-12 14:14:44 +02:00

CMakeProject.mimetypes.xml

Add *.cmake to glob patterns for cmake files.

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

cmakeproject.qrc

Initial import

2008-12-02 12:01:29 +01:00

cmakeprojectconstants.h

-cmake syntax highlighting, with the help from Daniel

2010-03-30 12:11:32 +02:00

cmakeprojectmanager_dependencies.pri

Initial import

2008-12-02 12:01:29 +01:00

cmakeprojectmanager.cpp

Fixed translation of "Projects"

2010-06-16 17:30:18 +02:00

cmakeprojectmanager.h

Added icons to options dialog categories

2010-03-26 17:47:31 +01:00

CMakeProjectManager.pluginspec

Version update to match the planned version naming.

2010-06-11 16:41:11 +02:00

cmakeprojectmanager.pro

-cmake syntax highlighting, with the help from Daniel

2010-03-30 12:11:32 +02:00

cmakeprojectnodes.cpp

File renaming

2010-05-12 14:14:44 +02:00

cmakeprojectnodes.h

File renaming

2010-05-12 14:14:44 +02:00

cmakeprojectplugin.cpp

-cmake syntax highlighting, with the help from Daniel

2010-03-30 12:11:32 +02:00

cmakeprojectplugin.h

Long live the king!

2010-03-05 11:28:13 +01:00

cmakerunconfiguration.cpp

Cmake: Don't delete run configurations on switching buildconfigurations

2010-06-09 13:23:33 +02:00

cmakerunconfiguration.h

Cmake: Don't delete run configurations on switching buildconfigurations

2010-06-09 13:23:33 +02:00

cmaketarget.cpp

Cmake: Don't delete run configurations on switching buildconfigurations

2010-06-09 13:23:33 +02:00

cmaketarget.h

Enable shadowbuilding by default for CMake projects

2010-03-25 16:11:25 +01:00

makestep.cpp

make it possible to remove CMakeProject::MakeStep

2010-04-26 12:17:05 +02:00

makestep.h

Fix parsing of CMake progress indicators

2010-04-01 15:29:03 +02:00