Liang Qi bb0fec8057 Merge remote-tracking branch 'origin/5.10' into 5.11 ... Conflicts: src/corelib/corelib.pro src/corelib/global/qrandom.cpp src/network/access/qhttpnetworkrequest_p.h src/plugins/platforms/cocoa/qcocoamenu.mm src/plugins/platforms/cocoa/qcocoansmenu.mm src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/offscreen/qoffscreenintegration.h src/widgets/kernel/qaction.cpp src/widgets/widgets.pro Done-with: Andy Shaw <andy.shaw@qt.io> Change-Id: Ib01547cf4184023f19858ccf0ce7fb824fed2a8d		2018-02-15 10:14:11 +01:00
..
doc	Document licenses for all Qt modules	2018-01-24 13:19:24 +00:00
gl2paintengineex	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
opengl.pro	Merge remote-tracking branch 'origin/5.10' into 5.11	2018-02-15 10:14:11 +01:00
qgl_p.h	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
qgl.cpp	Add more Q_FALLTHROUGH()	2018-01-12 07:10:25 +00:00
qgl.h	doc: clangqdoc needs to see all GLxxx typedefs	2017-12-02 17:30:17 +00:00
qglbuffer.cpp	Fix crash when running tst_qlbuffers under Angle	2017-06-28 11:25:42 +00:00
qglbuffer.h	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
qglcolormap.cpp	Updated license headers	2016-01-15 12:25:24 +00:00
qglcolormap.h	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
qglframebufferobject_p.h	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
qglframebufferobject.cpp	Use QT_CONFIG(library) instead of QT_NO_LIBRARY	2017-03-06 11:27:20 +00:00
qglframebufferobject.h	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
qglfunctions.cpp	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
qglfunctions.h	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
qglpaintdevice_p.h	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
qglpaintdevice.cpp	Make high-dpi QGLWidget work cross platform	2017-08-02 21:58:21 +00:00
qglpixelbuffer_p.h	Add missing override into Qt modules	2016-12-01 12:07:13 +00:00
qglpixelbuffer.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-13 01:05:02 +02:00
qglpixelbuffer.h	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
qglshaderprogram.cpp	QtBase (remainder): use printf-style qWarning/qDebug where possible (I)	2016-03-12 17:29:36 +00:00
qglshaderprogram.h	doc: clangqdoc must always see GL typedefs	2017-12-08 17:37:54 +00:00
qgraphicsshadereffect_p.h	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
qgraphicsshadereffect.cpp	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
qtopenglglobal.h	Updated license headers	2016-01-21 18:55:18 +00:00