Eike Ziller c175f1e62f Merge remote-tracking branch 'origin/4.2' ...

Conflicts:
	src/plugins/ios/iosdevice.cpp
	src/plugins/ios/iossimulator.cpp
	src/plugins/projectexplorer/projectwindow.cpp
	src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp
	src/shared/qbs

Change-Id: Ie98e2401a2259903141a13170c78388f2da467d2

2016-12-09 12:42:01 +01:00

..

api

Doc: Introduce a macro \macos to adapt to upcoming renamings

2016-08-03 15:30:06 +00:00

config

Doc: Add docs for SCXML Editor

2016-10-06 14:05:26 +00:00

doxygen

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

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

examples

Merge remote-tracking branch 'origin/4.0'

2016-05-09 16:37:41 +02:00

images

Merge remote-tracking branch 'origin/4.2'

2016-12-09 12:42:01 +01:00

src

Merge remote-tracking branch 'origin/4.2'

2016-12-09 12:42:01 +01:00

titlecase

Strip BOM from files

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

doc.pri

Support make install also on OS X

2016-04-22 06:46:11 +00:00

doc.qbs

Build documentation also when using qbs.

2016-04-27 07:05:19 +00:00

fixnavi.pl

make fixnavi recognize \example as an alias for \page

2015-09-23 17:22:34 +00:00

qtcreator-online.qdocconf

Doc: Update the copyright year in the page footer to 2016

2016-11-10 11:51:20 +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