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
..
configure_pch.h	Updated license headers	2016-01-21 18:55:18 +00:00
configure.pro	move license check to qmake-based configure system	2016-12-08 12:40:53 +00:00
configureapp.cpp	move license check to qmake-based configure system	2016-12-08 12:40:53 +00:00
configureapp.h	move license check to qmake-based configure system	2016-12-08 12:40:53 +00:00
environment.cpp	move license check to qmake-based configure system	2016-12-08 12:40:53 +00:00
environment.h	move license check to qmake-based configure system	2016-12-08 12:40:53 +00:00
main.cpp	move license check to qmake-based configure system	2016-12-08 12:40:53 +00:00
Makefile.mingw	Merge remote-tracking branch 'origin/5.8' into dev	2016-12-13 09:39:20 +01:00
Makefile.win32	Merge remote-tracking branch 'origin/5.8' into dev	2016-12-13 09:39:20 +01:00