AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
fc35f71434
qt5base-lts/doc/global
History
Frederik Gladhorn fc35f71434 Merge remote-tracking branch 'origin/5.4' into dev 
Conflicts:
	src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
	src/gui/image/qimage_conversions.cpp
	src/gui/opengl/qopenglextensions_p.h
	src/gui/text/qtextengine.cpp
	src/network/ssl/qsslsocket_openssl.cpp
	src/plugins/platforms/eglfs/qeglfshooks_stub.cpp
	src/plugins/platforms/eglfs/qeglfsscreen.cpp
	src/plugins/platforms/eglfs/qeglfswindow.cpp
	src/plugins/platforms/windows/qwindowsfontdatabase.cpp
	src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
	src/plugins/platforms/windows/qwindowsnativeinterface.cpp
	src/plugins/platforms/windows/qwindowsscreen.cpp
	src/plugins/platforms/windows/qwindowswindow.cpp
	src/plugins/platforms/windows/qwindowswindow.h
	src/plugins/platforms/xcb/qxcbdrag.h
	src/widgets/itemviews/qabstractitemview.cpp
	src/widgets/kernel/qwidget.cpp
	src/widgets/util/qsystemtrayicon_p.h
	tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp

Thanks to Friedemann Kleint for resolving the qwindowsfontdatabase.cpp
conflicts.

Change-Id: I937232c30523d5121c195d947d92aec6f129b03e
2015-02-10 09:42:25 +01:00
..
externalsites Doc: added entry for link to main page Qt Creator 2015-01-16 10:29:35 +01:00
includes Doc: Add a section all modules can use for example documentation. 2014-04-09 10:37:29 +02:00
includes-online Doc: new template for qt.io online style 2014-12-03 12:20:07 +01:00
template Merge remote-tracking branch 'origin/5.4' into dev 2014-12-10 07:58:06 +01:00
compat.qdocconf qdoc: Fix the qdoc \include command 2013-08-22 16:11:29 +02:00
config.qdocconf Bump copyright year to 2015 2015-01-15 09:24:51 +01: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 Bump copyright year to 2015 2015-01-15 09:24:51 +01:00
html-footer.qdocconf Bump copyright year to 2015 2015-01-15 09:24:51 +01:00
html-header-offline.qdocconf Doc: Fixed QDoc's navigation mechanism. 2013-06-25 14:03:24 +02:00
html-header-online.qdocconf Change bugreports.qt-project.org -> bugreports.qt.io 2014-12-18 09:46:09 +01: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 Make it more obvious that Q_WS_ is dead code, and should perhaps be ported 2015-02-03 11:49:14 +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: new template for qt.io online style 2014-12-03 12:20:07 +01: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: new template for qt.io online style 2014-12-03 12:20:07 +01:00
qt-module-defaults-online.qdocconf Bump copyright year to 2015 2015-01-15 09:24:51 +01:00
qt-module-defaults.qdocconf Doc: Fixed QDoc's navigation mechanism. 2013-06-25 14:03:24 +02:00