Eike Ziller 8df0653bf8 Merge remote-tracking branch 'origin/4.10' ...

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp

Change-Id: Iffdf48e782a734107ea170ebb3812e997cea0e7b

2019-09-12 09:08:04 +02:00

..

api

Doc: Update guidelines to improve the quality of screenshots in docs

2019-06-05 07:04:34 +00:00

config

Doc: Add info on Live Preview

2019-07-11 12:51:31 +00:00

doxygen

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

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

examples

Doc: Describe adding the import path

2019-06-18 10:24:42 +00:00

images

Doc: Describe the Curve Editor

2019-09-04 15:32:01 +00:00

src

Merge remote-tracking branch 'origin/4.10'

2019-09-12 09:08:04 +02:00

titlecase

Strip BOM from files

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

CMakeLists.txt

CMake: Use Qt5::qhelpgenerator target

2019-06-04 07:40:19 +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

Use QTCREATOR_COPYRIGHT_YEAR for documentation

2018-03-28 06:45:51 +00:00

qtcreator.qdocconf

Use QTCREATOR_COPYRIGHT_YEAR for documentation

2018-03-28 06:45:51 +00:00

runframework.dia

Initial import

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