qt6-bb10/examples/widgets
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
..
animation Use qRadiansToDegrees() and qDegreesToRadians() more widely 2017-07-05 10:15:34 +00:00
desktop Merge remote-tracking branch 'origin/5.8' into dev 2017-01-25 20:06:06 +01:00
dialogs examples: remove wince leftovers 2017-09-22 19:22:07 +00:00
doc Doc: minor language edits 2017-09-29 08:52:59 +00:00
draganddrop Merge remote-tracking branch 'origin/5.7' into dev 2016-08-16 07:58:32 +02:00
effects Use qRadiansToDegrees() and qDegreesToRadians() more widely 2017-07-05 10:15:34 +00:00
gestures Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
graphicsview Exploit QVector3D::length() instead of duplicating its work 2017-07-07 18:09:08 +00:00
itemviews Polish the StorageView example 2017-09-20 12:19:39 +00:00
layouts Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
mac macOS: Make QMacNativeWidget example more usable 2017-02-12 12:29:55 +00:00
mainwindows Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
painting Merge remote-tracking branch 'origin/5.9' into dev 2017-07-13 16:36:10 -07:00
richtext Convert features.printdialog to QT_[REQUIRE_]CONFIG 2017-05-30 17:21:26 +00:00
scroller Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
statemachine Examples: Remove more redundant virtual specifiers for overriders 2016-11-29 10:06:02 +00:00
tools Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
tutorials Tutorial: migrate addressbook tutorial to use QRegularExpression 2017-01-24 07:24:13 +00:00
widgets Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
windowcontainer Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
widgets.pro examples: fix compile without gui module 2017-05-05 06:54:15 +00:00