Liang Qi 6b8f422c5e Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/io/qsettings.cpp src/corelib/itemmodels/qstringlistmodel.cpp tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03		2016-08-13 01:05:02 +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	Unify license header usage.	2016-03-29 10:20:03 +00:00