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
..
bearerex	Updated license headers	2016-01-21 18:55:18 +00:00
cocoa	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-30 09:16:58 +01:00
corelib/tools	Updated license headers	2016-01-21 18:55:18 +00:00
diaglib	Merge remote-tracking branch 'origin/dev' into 5.11	2018-02-10 15:55:52 +01:00
dialogs	Manual dialog test: fix use custom directory icon option setting	2017-06-13 16:14:34 +00:00
embeddedintoforeignwindow	tests: Unify license to GPL-EXCEPT	2017-04-03 07:18:46 +00:00
filetest	QFileSystemEngine/Unix: rework the getting of nsec-precision file times	2017-08-06 23:14:26 +00:00
foreignwindows	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
gestures	Updated license headers	2016-01-21 18:55:18 +00:00
highdpi	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
inputmethodhints	Updated license headers	2016-01-21 18:55:18 +00:00
keypadnavigation	Updated license headers	2016-01-21 18:55:18 +00:00
lance	Fix compilation of manual lance test	2017-08-04 18:48:29 +00:00
mkspecs	Updated license headers	2016-01-21 18:55:18 +00:00
network_remote_stresstest	QHostInfo: Make getaddrinfo() mandatory	2017-10-18 09:26:43 +00:00
network_stresstest	QHostInfo: Make getaddrinfo() mandatory	2017-10-18 09:26:43 +00:00
qcursor	tests: Unify license to GPL-EXCEPT	2017-04-03 07:18:46 +00:00
qdesktopservices	Updated license headers	2016-01-21 18:55:18 +00:00
qdesktopwidget	Updated license headers	2016-01-21 18:55:18 +00:00
qgraphicsitem	Updated license headers	2016-01-21 18:55:18 +00:00
qgraphicsitemgroup	Updated license headers	2016-01-21 18:55:18 +00:00
qgraphicslayout/flicker	Updated license headers	2016-01-21 18:55:18 +00:00
qhttpnetworkconnection	Updated license headers	2016-01-21 18:55:18 +00:00
qimagereader	Updated license headers	2016-01-21 18:55:18 +00:00
qlayout	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
qlocale	tests: Unify license to GPL-EXCEPT	2017-04-03 07:18:46 +00:00
qmetatype	Updated license headers	2016-01-21 18:55:18 +00:00
qmimedatabase	Updated license headers	2016-01-21 18:55:18 +00:00
qnetworkaccessmanager/qget	Updated license headers	2016-01-21 18:55:18 +00:00
qnetworkconfiguration	Updated license headers	2016-01-21 18:55:18 +00:00
qnetworkconfigurationmanager	Updated license headers	2016-01-21 18:55:18 +00:00
qnetworkreply	Updated license headers	2016-01-21 18:55:18 +00:00
qopenglcontext	port to modularized platformsupport libraries	2016-10-15 18:45:41 +00:00
qopengltextureblitter	Make QOpenGLTextureBlitter public	2016-07-29 07:21:10 +00:00
qopenglwidget/openglwidget	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-02-18 20:50:35 +01:00
qopenglwindow/multiwindow	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-09-21 07:14:40 +02:00
qprintdevice_dump	Updated license headers	2016-01-21 18:55:18 +00:00
qscreen	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
qssloptions	Updated license headers	2016-01-21 18:55:18 +00:00
qsslsocket	Updated license headers	2016-01-21 18:55:18 +00:00
qstorageinfo	tests: Unify license to GPL-EXCEPT	2017-04-03 07:18:46 +00:00
qsysinfo	QSysInfo: add a function that returns the boot ID	2017-11-05 18:34:09 +00:00
qt_poll	Updated license headers	2016-01-21 18:55:18 +00:00
qtabbar	macOS: Fix padding around tab label with icon	2017-08-18 07:27:52 +00:00
qtabletevent	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-24 13:40:55 +02:00
qtbug-8933	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
qtbug-52641	tests: Unify license to GPL-EXCEPT	2017-04-03 07:18:46 +00:00
qtexteditlist	Updated license headers	2016-01-21 18:55:18 +00:00
qtouchevent	Updated license headers	2016-01-21 18:55:18 +00:00
qvulkaninstance	Basic Vulkan enablers	2017-03-17 16:12:03 +00:00
qwidget_zorder	Updated license headers	2016-01-21 18:55:18 +00:00
repaint	Updated license headers	2016-01-21 18:55:18 +00:00
shortcuts	Add manual test for shortcut using implicit AltGr	2016-05-30 15:30:57 +00:00
socketengine	Updated license headers	2016-01-21 18:55:18 +00:00
textrendering	Change almost all other uses of qrand() to QRandomGenerator	2017-11-08 09:14:03 +00:00
touch	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
touchGraphicsItem	Set the ellipseDiameters back to the original size in QGraphicsView	2018-02-08 21:25:01 +00:00
transientwindow	Updated license headers	2016-01-21 18:55:18 +00:00
triangulator	Add manual test for the QtGui triangulator	2017-01-24 16:23:20 +00:00
unc	Updated license headers	2016-01-21 18:55:18 +00:00
widgetgrab	Updated license headers	2016-01-21 18:55:18 +00:00
widgets	tests/manual/widgets/styles: Extend the style icon display	2018-01-26 22:57:08 +00:00
windowchildgeometry	Change almost all other uses of qrand() to QRandomGenerator	2017-11-08 09:14:03 +00:00
windowflags	windowflags: Allow testing of naked QWindows, not just QWidgets	2017-06-27 21:56:56 +00:00
windowgeometry	Updated license headers	2016-01-21 18:55:18 +00:00
windowmodality	Updated license headers	2016-01-21 18:55:18 +00:00
windowtransparency	tests: Unify license to GPL-EXCEPT	2017-04-03 07:18:46 +00:00
xcb_gl_integration	Updated license headers	2016-01-21 18:55:18 +00:00
xembed-raster	tests: Unify license to GPL-EXCEPT	2017-04-03 07:18:46 +00:00
xembed-widgets	tests: Unify license to GPL-EXCEPT	2017-04-03 07:18:46 +00:00
manual.pro	Basic Vulkan enablers	2017-03-17 16:12:03 +00:00