Eike Ziller b687658663 Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cpptools/cppcompletion_test.cpp

Change-Id: Ic5e75b3ef164de664a1449ffa8579beaf5b02521

2014-04-08 11:18:40 +02:00

..

api

Doc: Fix typo

2014-04-03 14:40:46 +02:00

config

Doc: remove Qt Simulator macro

2014-03-14 16:14:05 +01:00

doxygen

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

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

examples

Doc: Delete obsolete doc examples

2014-04-01 14:26:03 +02:00

images

Doc: update QML Profiler information

2014-04-07 14:28:46 +02:00

snippets/qml

Doc: update the Android tutorial

2013-10-29 15:22:17 +01:00

src

Doc: change filename and page name to match title

2014-04-07 16:54:52 +02:00

templates

Incremented year in copyright info

2014-01-08 08:29:47 +01:00

titlecase

Incremented year in copyright info

2014-01-08 08:29:47 +01:00

doc.pri

Doc: remove addressbook-sdk.qdoc from help dependencies

2014-03-25 15:41:18 +01:00

fixnavi.pl

validate TOC references

2013-11-04 14:48:46 +01:00

qtcreator-online-qt4.qdocconf

use qt's qdoc templates when building against qt5

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

qtcreator-online.qdocconf

use qt's qdoc templates when building against qt5

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

qtcreator-qt4.qdocconf

use qt's qdoc templates when building against qt5

2013-02-15 11:35:22 +01: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