Liang Qi 6755ec891a Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: configure qmake/Makefile.unix.macos qmake/Makefile.unix.win32 qmake/generators/win32/msvc_vcproj.cpp src/3rdparty/pcre/qt_attribution.json src/corelib/io/qsettings.cpp src/corelib/kernel/qdeadlinetimer.cpp src/platformsupport/kmsconvenience/qkmsdevice.cpp src/platformsupport/kmsconvenience/qkmsdevice_p.h src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h tests/manual/qstorageinfo/printvolumes.cpp tools/configure/configureapp.cpp Change-Id: Ibaabcc8e965c44926f9fb018466e8b132b8df49e		2016-12-13 09:39:20 +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	Support large custom icons for the system tray balloon notification	2016-09-07 17:56:28 +00:00
window.h	Examples: Replace 'Q_DECL_OVERRIDE' by 'override'	2016-06-15 09:32:30 +00:00