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

Conflicts:
	src/plugins/cppeditor/cppdocumentationcommenthelper.cpp

Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d

2015-01-08 10:38:20 +01:00

..

examples

ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec files

2014-09-02 15:11:24 +02:00

images

Doc: fix changed UI string in docs and update screenshot

2014-12-17 17:11:33 +01:00

coding-style.qdoc

Merge remote-tracking branch 'origin/3.3'

2015-01-08 10:38:20 +01:00

creating-plugins.qdoc

ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec files

2014-09-02 15:11:24 +02:00

external-tool-spec.qdoc

Doc: replace remaining \gui commands with \uicontrol

2014-12-18 09:31:51 +01:00

first-plugin.qdoc

Doc: replace remaining \gui commands with \uicontrol

2014-12-18 09:31:51 +01:00

getting-and-building.qdoc

Update "getting and building" page.

2014-05-16 16:42:48 +02:00

plugin-lifecycle.qdoc

ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec files

2014-09-02 15:11:24 +02:00

plugin-metadata.qdoc

Doc: replace remaining \gui commands with \uicontrol

2014-12-18 09:31:51 +01:00

pluginmanager.qdoc

Incremented year in copyright info

2014-01-08 08:29:47 +01:00

qtcreator-api.qdoc

Doc: replace remaining \gui commands with \uicontrol

2014-12-18 09:31:51 +01:00

qtcreator-dev-online.qdocconf

use qt's qdoc templates when building against qt5

2013-02-15 11:35:22 +01:00

qtcreator-dev-wizards.qdoc

Doc: replace remaining \gui commands with \uicontrol

2014-12-18 09:31:51 +01:00

qtcreator-dev.qdoc

Doc: replace remaining \gui commands with \uicontrol

2014-12-18 09:31:51 +01:00

qtcreator-dev.qdocconf

use qt's qdoc templates when building against qt5

2013-02-15 11:35:22 +01:00

qtcreator-documentation.qdoc

Doc: replace remaining \gui commands with \uicontrol

2014-12-18 09:31:51 +01:00

qtcreator-ui-text.qdoc

Doc: replace remaining \gui commands with \uicontrol

2014-12-18 09:31:51 +01:00