Oswald Buddenhagen 6fb94a7b10 Merge branch '2.7' ...

Conflicts:
	doc/src/qtquick/qtquick-components.qdoc
	doc/src/qtquick/qtquick-designer.qdoc
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cppeditor/cppinsertdecldef.cpp
	src/plugins/qnx/qnxruncontrolfactory.cpp

Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88

2013-05-15 10:21:47 +02:00

..

api

Add documentation for variable chooser.

2013-04-02 17:34:48 +02:00

config

Hide internal API when generating API documentation.

2013-04-03 09:19:18 +02:00

doxygen

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

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

examples

Doc: update the tutorial app to Qt Quick 2

2013-03-06 16:42:15 +01:00

images

Merge branch '2.7'

2013-05-15 10:21:47 +02:00

snippets/qml

Doc: put QML snippets back to text

2013-02-15 09:28:16 +01:00

src

Merge branch '2.7'

2013-05-15 10:21:47 +02:00

templates

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

titlecase

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

addressbook-sdk.qdoc

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

doc.pri

Add document about plugin manager/object pool.

2013-04-02 15:42:07 +02:00

fixnavi.pl

adapt fixnavi to \o => \li change

2013-02-28 16:49:46 +01:00

qt.index

Remove Qt 4.8 index.html from qt.index.

2012-12-17 13:57:24 +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