Liang Qi 17198e03ab Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: qmake/doc/src/qmake-manual.qdoc src/corelib/global/qglobal.cpp src/corelib/tools/qstring.cpp src/network/socket/qabstractsocket.cpp src/network/socket/qnativesocketengine_unix.cpp src/plugins/platforms/eglfs/api/qeglfsglobal.h Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288		2016-08-16 07:58:32 +02:00
..
doc	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-13 01:05:02 +02: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	Unify license header usage.	2016-03-29 10:20:03 +00:00
window.h	Examples: Replace 'Q_DECL_OVERRIDE' by 'override'	2016-06-15 09:32:30 +00:00