qt5base-lts/doc/global
Frederik Gladhorn 5c23199d4e Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
	configure
	mkspecs/macx-xcode/Info.plist.app
	mkspecs/macx-xcode/Info.plist.lib
	qmake/doc/qmake.qdocconf
	src/corelib/global/qglobal.h
	tests/auto/other/exceptionsafety/exceptionsafety.pro
	tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp

Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a
2013-08-14 09:06:31 +02:00
..
externalsites Add the RFC2822Date format 2013-07-24 15:02:35 +02:00
template Doc: Edited CSS files in doc/global/template 2013-07-23 16:30:06 +02:00
compat.qdocconf Doc: Adding base macros and other QDoc definitions 2012-10-26 12:58:03 +02:00
config.qdocconf Doc: Fixed QDoc's navigation mechanism. 2013-06-25 14:03:24 +02:00
fileextensions.qdocconf Doc: Fixed QDoc's navigation mechanism. 2013-06-25 14:03:24 +02:00
html-config.qdocconf Doc: Fixed QDoc's navigation mechanism. 2013-06-25 14:03:24 +02:00
html-footer.qdocconf Doc: Fixed QDoc's navigation mechanism. 2013-06-25 14:03:24 +02:00
html-header-offline.qdocconf Doc: Fixed QDoc's navigation mechanism. 2013-06-25 14:03:24 +02:00
html-header-online.qdocconf Doc: Fixed QDoc's navigation mechanism. 2013-06-25 14:03:24 +02:00
macros.qdocconf Doc: Adding base macros and other QDoc definitions 2012-10-26 12:58:03 +02:00
manifest-meta.qdocconf Doc: Re-highlight Tweet Search demo 2013-07-29 15:08:58 +02:00
qt-cpp-defines.qdocconf Doc: ignore "Q_NORETURN" in function signatures. 2013-08-13 01:38:54 +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: Fixed QDoc's navigation mechanism. 2013-06-25 14:03:24 +02:00
qt-module-defaults-offline.qdocconf Doc: Fixed QDoc's navigation mechanism. 2013-06-25 14:03:24 +02:00
qt-module-defaults-online.qdocconf Doc: Fixed QDoc's navigation mechanism. 2013-06-25 14:03:24 +02:00
qt-module-defaults.qdocconf Doc: Fixed QDoc's navigation mechanism. 2013-06-25 14:03:24 +02:00