Frederik Gladhorn 77da617dc8 Merge remote-tracking branch 'origin/5.5' into dev ...

Conflicts:
	doc/global/qt-cpp-defines.qdocconf
	src/3rdparty/forkfd/forkfd.c
	src/corelib/codecs/qtextcodec.cpp
	src/corelib/kernel/qmetatype.cpp
	src/corelib/tools/qset.qdoc
	src/gui/accessible/qaccessible.cpp
	src/gui/image/qpixmapcache.cpp
	src/opengl/qgl.cpp
	src/tools/qdoc/generator.cpp
	src/widgets/kernel/qwidget.cpp
	tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp

Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085

2015-08-06 10:54:01 +02:00

..

externalsites

Doc: Added the Qt Multimedia backends wiki link

2015-05-13 11:55:07 +00:00

includes

Doc: Add a section all modules can use for example documentation.

2014-04-09 10:37:29 +02:00

includes-online

Update copyright headers

2015-02-11 06:49:51 +00:00

template

Doc: Updated the footer in the online template

2015-07-01 12:26:37 +00:00

compat.qdocconf

qdoc: Fix the qdoc \include command

2013-08-22 16:11:29 +02:00

config.qdocconf

Update copyright headers

2015-02-11 06:49:51 +00:00

externalsites.qdocconf

Doc: Do not include the external sites by default

2014-09-03 09:40:59 +02:00

fileextensions.qdocconf

Doc: new template for qt.io online style

2014-12-03 12:20:07 +01:00

html-config.qdocconf

QDoc: Introduce a variable to set table of contents depth.

2014-06-11 15:13:29 +02:00

html-footer-online.qdocconf

Doc: Updated online template with the latest footer

2015-07-16 08:02:58 +00:00

html-footer.qdocconf

Doc: Update Copyright information in template/footer

2015-02-26 12:26:01 +00:00

html-header-offline.qdocconf

Doc: Fixed QDoc's navigation mechanism.

2013-06-25 14:03:24 +02:00

html-header-online.qdocconf

Doc: Update online documentation template

2015-04-14 08:32:46 +00:00

macros.qdocconf

qdoc: Fix output of \br command

2014-08-26 20:07:40 +02:00

manifest-meta.qdocconf

Doc: Update the list of highlighted examples

2015-06-22 06:24:59 +00:00

qt-cpp-defines.qdocconf

Merge remote-tracking branch 'origin/5.5' into dev

2015-08-06 10:54:01 +02:00

qt-html-templates-offline.qdocconf

Doc: Fixed QDoc's navigation mechanism.

2013-06-25 14:03:24 +02:00

qt-html-templates-online.qdocconf

Doc: Update online documentation template

2015-02-26 12:26:15 +00:00

qt-module-defaults-offline.qdocconf

Doc: new template for qt.io online style

2014-12-03 12:20:07 +01:00

qt-module-defaults-online-commercial.qdocconf

Doc: Update online documentation template

2015-02-26 12:26:15 +00:00

qt-module-defaults-online.qdocconf

Doc: Update Copyright information in template/footer

2015-02-26 12:26:01 +00:00

qt-module-defaults.qdocconf

Doc: Fixed QDoc's navigation mechanism.

2013-06-25 14:03:24 +02:00