Liang Qi d0a0a3c041 Merge remote-tracking branch 'origin/5.10' into dev ... Conflicts: examples/network/fortuneclient/client.cpp examples/network/fortuneserver/server.cpp src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h src/plugins/platforms/cocoa/qcocoabackingstore.h src/plugins/platforms/cocoa/qcocoaintegration.h src/plugins/platforms/cocoa/qcocoascreen.h src/plugins/platforms/ios/qiosbackingstore.h src/plugins/sqldrivers/oci/qsql_oci.cpp src/widgets/kernel/qwidgetwindow.cpp Change-Id: Ia6dd2c52d4a691b671cf9a2ffca70deccece8f10		2017-10-17 10:34:24 +02:00
..
appicon	Updated license headers	2016-01-21 18:55:18 +00:00
menurama	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
menus	Updated license headers	2016-01-21 18:55:18 +00:00
nativewidgets	Updated license headers	2016-01-21 18:55:18 +00:00
popups	Updated license headers	2016-01-21 18:55:18 +00:00
qmaccocoaviewcontainer	Implement QMacCocoaViewContainer in terms of foreign window	2016-10-05 19:37:17 +00:00
qsystemtrayicon	Updated license headers	2016-01-21 18:55:18 +00:00
qt_on_cocoa	macOS: Deliver NSWindow notifications to all windows, not just top level	2017-09-26 12:50:05 +00:00
wheelevent	Updated license headers	2016-01-21 18:55:18 +00:00