AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
72f5867f14
qt5base-lts/doc/global
History
Liang Qi 72f5867f14 Merge remote-tracking branch 'origin/5.6' into dev 
Conflicts:
	src/corelib/kernel/qcoreapplication.cpp
	src/corelib/kernel/qeventdispatcher_blackberry.cpp
	src/network/bearer/qnetworkconfiguration.cpp
	src/plugins/bearer/blackberry/qbbengine.cpp
	src/plugins/platforms/android/androidjnimain.cpp
	src/plugins/platforms/android/qandroidplatformtheme.cpp
	src/plugins/platforms/qnx/qqnxbpseventfilter.cpp
	src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp
	src/plugins/platforms/qnx/qqnxinputcontext_imf.cpp
	src/plugins/platforms/qnx/qqnxintegration.cpp
	src/plugins/platforms/qnx/qqnxnavigatorbps.cpp
	src/plugins/platforms/qnx/qqnxvirtualkeyboardbps.cpp
	src/plugins/platforms/qnx/qqnxwindow.cpp
	src/widgets/kernel/qwidgetwindow.cpp
	src/widgets/styles/qwindowsvistastyle.cpp
	src/widgets/styles/qwindowsxpstyle.cpp
	src/widgets/widgets/qtoolbararealayout.cpp
	tests/auto/corelib/global/qflags/qflags.pro
	tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp
	tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
	tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp

Change-Id: I37be88c6c185bb85404823353e027a0a6acdbce4
2015-12-02 23:33:06 +01:00
..
externalsites Merge remote-tracking branch 'origin/5.6' into dev 2015-11-27 08:27:53 +01: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: Add ordered list-specific styles 2015-11-30 11:18:30 +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 Add shader files to examples documentation file list 2015-09-22 21:40:13 +00: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-08-26 09:45:55 +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-11-30 11:44:28 +00:00
qt-cpp-defines.qdocconf Ignore Q_SERIALBUS_EXPORT and Q_DECL_EQ_DEFAULT in qdoc 2015-11-30 08:46:08 +00:00
qt-html-templates-offline-simple.qdocconf Doc: Use a navigation separator in the simple offline template 2015-10-28 11:55:05 +00:00
qt-html-templates-offline.qdocconf Doc: Improve selection of offline template type 2015-10-21 08:15:35 +00: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: Improve selection of offline template type 2015-10-21 08:15:35 +00: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