Liang Qi ce9519593a Merge remote-tracking branch 'origin/5.4' into 5.5 ... Conflicts: mkspecs/android-g++/qmake.conf qmake/generators/unix/unixmake2.cpp src/gui/image/qimage_conversions.cpp Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0		2015-03-31 10:03:31 +02:00
..
externalsites	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-31 10:03:31 +02: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	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-31 10:03:31 +02: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: Update links to forum.qt.io	2015-03-12 12:37:00 +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 links to forum.qt.io	2015-03-12 12:37:00 +00:00
macros.qdocconf	qdoc: Fix output of \br command	2014-08-26 20:07:40 +02:00
manifest-meta.qdocconf	Move Qt Core examples under a common subdirectory	2014-10-17 14:57:13 +02:00
qt-cpp-defines.qdocconf	qdoc: Let qdoc ignore Q_ENUM and Q_FLAG	2015-02-20 09:31:33 +00: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