Liang Qi 318b58562a Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: .qmake.conf mkspecs/common/msvc-desktop.conf mkspecs/common/msvc-version.conf mkspecs/common/winrt_winphone/qmake.conf mkspecs/features/mac/default_post.prf mkspecs/features/mac/sdk.prf mkspecs/features/qt.prf mkspecs/features/uikit/default_post.prf mkspecs/features/winrt/default_pre.prf mkspecs/winphone-arm-msvc2013/qmake.conf mkspecs/winphone-x86-msvc2013/qmake.conf mkspecs/winrt-arm-msvc2013/qmake.conf mkspecs/winrt-x64-msvc2013/qmake.conf mkspecs/winrt-x86-msvc2013/qmake.conf qmake/generators/win32/msvc_vcproj.cpp src/gui/kernel/qwindowsysteminterface.cpp src/network/kernel/qhostaddress.cpp src/plugins/platforms/mirclient/qmirclientplugin.cpp src/plugins/platforms/mirclient/qmirclientplugin.h src/widgets/util/qsystemtrayicon.cpp tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp tools/configure/Makefile.mingw tools/configure/Makefile.win32 Done-with: Jake Petroules <jake.petroules@qt.io> Done-with: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Change-Id: I4be3262d3994e11929d3b1ded2c3379783797dbe		2017-01-25 20:06:06 +01:00
..
doc	Doc: update Qt Widgets examples	2016-12-12 14:43:02 +00:00
images	systray example: revert the heart icon to its previous version	2015-01-28 12:51:03 +00:00
main.cpp	Unify license header usage.	2016-03-29 10:20:03 +00:00
systray.pro	Remove warnings about examples not running in the Qt Simulator	2013-10-09 21:45:31 +02:00
systray.qrc	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00
window.cpp	Merge remote-tracking branch 'origin/5.8' into dev	2017-01-25 20:06:06 +01:00
window.h	Examples: Replace 'Q_DECL_OVERRIDE' by 'override'	2016-06-15 09:32:30 +00:00