qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtbase/doc/global
History
Frederik Gladhorn 34aba4724f Merge remote-tracking branch 'origin/5.4' into dev 
Conflicts:
	src/corelib/io/qiodevice.cpp
	src/plugins/bearer/linux_common/qofonoservice_linux.cpp
	src/plugins/bearer/linux_common/qofonoservice_linux_p.h
	src/plugins/platforms/android/qandroidplatformtheme.cpp
	src/tools/bootstrap/bootstrap.pro
	src/widgets/styles/qmacstyle_mac.mm

Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b
 		2014-11-24 13:39:13 +01:00
..
externalsites Doc: add new Qt Creator Manual topics to externalpages 2014-11-05 12:28:53 +01:00
includes Doc: Add a section all modules can use for example documentation. 2014-04-09 10:37:29 +02:00
template Merge remote-tracking branch 'origin/5.4' into dev 2014-11-24 13:39:13 +01:00
compat.qdocconf qdoc: Fix the qdoc \include command 2013-08-22 16:11:29 +02:00
config.qdocconf Doc: Removed minor version from the doc URL. 2014-08-15 13:09:02 +02:00
externalsites.qdocconf Doc: Do not include the external sites by default 2014-09-03 09:40:59 +02:00
fileextensions.qdocconf Doc: Do not include the external sites by default 2014-09-03 09:40:59 +02:00
html-config.qdocconf QDoc: Introduce a variable to set table of contents depth. 2014-06-11 15:13:29 +02:00
html-footer.qdocconf Doc: Update year to 2014 2014-03-27 15:22:33 +01: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 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 Add Q_DECL_RELAXED_CONSTEXPR macro 2014-10-24 22:22:09 +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