Orgad Shaneh 49f6b0146a Merge remote-tracking branch 'origin/4.11' ...

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/mcusupport/mcusupportrunconfiguration.cpp
	src/plugins/python/pythonproject.cpp
	src/plugins/qmakeprojectmanager/qmakestep.cpp
	src/plugins/qmlprojectmanager/qmlproject.cpp
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I22507be28fd80c49c9fee0dff5937a40db176a82

2019-12-07 18:39:54 +02:00

..

api

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

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

config

Doc: Update info about Clang tools

2019-11-25 09:45:36 +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: Update info about building with CMake

2019-11-25 11:58:50 +00:00

src

Merge remote-tracking branch 'origin/4.11'

2019-12-07 18:39:54 +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