qt5base-lts/examples/widgets
Liang Qi 246799d8a7 Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
	examples/network/network-chat/peermanager.cpp
	src/widgets/util/qsystemtrayicon.cpp
	src/widgets/util/qsystemtrayicon_qpa.cpp
	src/widgets/util/qsystemtrayicon_win.cpp
	src/widgets/util/qsystemtrayicon_x11.cpp

Change-Id: I1c026df83818c0ccaf956980370e7522960627db
2017-01-30 12:46:20 +01:00
..
animation Examples: Remove a redundant virtual specifier for overriders 2016-11-25 22:36:21 +00:00
desktop Merge remote-tracking branch 'origin/5.8' into dev 2017-01-25 20:06:06 +01:00
dialogs Example: migrate the classwizard example to use QRegularExpression 2017-01-24 20:28:41 +00:00
doc Doc: Fixed old text still mentioning QRegExp 2017-01-24 20:28:22 +00:00
draganddrop Merge remote-tracking branch 'origin/5.7' into dev 2016-08-16 07:58:32 +02:00
effects Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
gestures Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
graphicsview Examples: Remove more redundant virtual specifiers for overriders 2016-11-29 10:06:02 +00:00
itemviews examples: Use QOverload to select overloaded signals and slots 2016-12-22 14:54:55 +00:00
layouts Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
mac Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
mainwindows examples: Use lambdas instead of functor classes 2017-01-09 15:42:13 +00:00
painting Merge remote-tracking branch 'origin/5.8' into dev 2016-12-16 16:38:33 +01:00
richtext examples: Use QOverload to select overloaded signals and slots 2016-12-22 14:54:55 +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 examples: Use QOverload to select overloaded signals and slots 2016-12-22 14:54:55 +00:00
tutorials Tutorial: migrate addressbook tutorial to use QRegularExpression 2017-01-24 07:24:13 +00:00
widgets examples: Use QOverload to select overloaded signals and slots 2016-12-22 14:54:55 +00:00
windowcontainer Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
widgets.pro Clean up some conditions in our pro files 2016-11-14 19:22:17 +00:00