Eike Ziller 86378da3be Merge remote-tracking branch 'origin/3.3' into 3.4 ...

Conflicts:
	src/plugins/debugger/debuggeroptionspage.cpp

Change-Id: I0282d66b16c14877d0131cccbe03573102b48bc3

2015-03-05 13:28:15 +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' into 3.4

2015-03-05 13:28:15 +01:00

creating-plugins.qdoc

Update License

2015-01-16 12:37:56 +01:00

external-tool-spec.qdoc

Update License

2015-01-16 12:37:56 +01:00

first-plugin.qdoc

Adapt documentation URL

2015-02-18 12:38:23 +00:00

getting-and-building.qdoc

Doc: fix remaining links to Qt wiki in docs

2015-03-04 10:49:37 +00:00

plugin-lifecycle.qdoc

Update License

2015-01-16 12:37:56 +01:00

plugin-metadata.qdoc

Update License

2015-01-16 12:37:56 +01:00

pluginmanager.qdoc

Update License

2015-01-16 12:37:56 +01:00

qtcreator-api.qdoc

Update License

2015-01-16 12:37:56 +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

Adapt documentation URL

2015-02-18 12:38:23 +00:00

qtcreator-dev.qdoc

Adapt documentation URL

2015-02-18 12:38:23 +00:00

qtcreator-dev.qdocconf

use qt's qdoc templates when building against qt5

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

qtcreator-documentation.qdoc

Replace old qt-project.org wiki with wiki.qt.io

2015-03-03 09:35:41 +00:00

qtcreator-ui-text.qdoc

Update License

2015-01-16 12:37:56 +01:00