Oswald Buddenhagen 777ca8e655 Merge remote-tracking branch 'origin/4.5' ...

Conflicts:
	src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
	src/plugins/qmlprofiler/qmlprofilertraceclient.cpp

Change-Id: I94647f59d7a9df48168ac066555afe80f5f9b91f

2017-12-21 13:20:24 +01:00

..

api

Doc: Add information about using the number icons and OptiPNG

2017-08-23 13:45:35 +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: Update Accelerate Bubble example to use the Swipe wizard

2017-11-07 09:33:18 +00:00

images

Doc: Update perf profiler documentation

2017-11-23 15:40:35 +00:00

src

Merge remote-tracking branch 'origin/4.5'

2017-12-21 13:20:24 +01: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