Eike Ziller ddd9e96afa Merge remote-tracking branch 'origin/4.4' ...

Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/libs/utils/utils-lib.pri
	src/plugins/clangcodemodel/clangbackendipcintegration.h
	src/shared/qbs

Change-Id: I240e89afc76d8f40ce69d66683014b603f714707

2017-08-23 12:12:41 +02:00

..

api

Doc: Update Wizard documentation

2017-04-05 13:37:39 +00:00

config

Doc: Describe the new toolbar in Qt Quick Designer

2017-05-04 06:44:03 +00:00

doxygen

Replace com.nokia.qtcreator with org.qt-project.qtcreator

2013-02-07 12:40:37 +01:00

examples

Doc: Remove Qt Quick UI Forms example and tutorial

2017-02-14 07:50:51 +00:00

images

Doc: Add step list for adding custom debugging helpers

2017-08-17 12:43:16 +00:00

src

Merge remote-tracking branch 'origin/4.4'

2017-08-23 12:12:41 +02:00

titlecase

Strip BOM from files

2015-10-01 10:51:10 +00:00

doc_targets.pri

Further abstract docs.pri

2017-03-23 09:53:22 +00:00

doc.pri

Further abstract docs.pri

2017-03-23 09:53:22 +00:00

doc.qbs

Embed the qbs documentation also when building with qbs

2017-03-10 15:47:54 +00:00

fixnavi.pl

make fixnavi actually work with examples

2017-03-13 12:27:08 +00:00

qtcreator-online.qdocconf

Doc: Change copyright year in online doc template to 2017

2017-01-24 10:50:36 +00:00

qtcreator.qdocconf

use qt's qdoc templates when building against qt5

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

runframework.dia

Initial import

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