Liang Qi d0eaa737e1 Merge remote-tracking branch 'origin/5.5' into 5.6 ... Conflicts: qmake/doc/src/qmake-manual.qdoc src/corelib/tools/qstring.h src/gui/image/qimagereader.cpp src/network/access/qnetworkaccessmanager.cpp src/tools/qdoc/doc/examples/examples.qdoc src/widgets/accessible/qaccessiblewidgetfactory_p.h src/widgets/doc/qtwidgets.qdocconf Change-Id: I8fae62283aebefe24e5ca4b4abd97386560c0fcb		2015-10-02 16:59:55 +02:00
..
doc	Doc: System Tray Icon example	2015-09-04 11:01:48 +00:00
images	systray example: revert the heart icon to its previous version	2015-01-28 12:51:03 +00:00
main.cpp	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
systray.pro	…
systray.qrc	…
window.cpp	Polish the systray example.	2015-09-01 06:06:30 +00:00
window.h	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00