Liang Qi dfc177e3a9 Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: qmake/library/qmakeevaluator.cpp (cherry picked from commit 1af6dc2c8fb4d91400fddc5050166f972ae57c9a in qttools) src/corelib/kernel/qcore_mac_objc.mm src/gui/painting/qcolor.h src/plugins/platforms/cocoa/qcocoawindow.mm Change-Id: I5b3ec468a5a9a73911b528d3d24ff8e19f339f31		2016-10-13 09:49:38 +02:00
..
configure_pch.h	Updated license headers	2016-01-21 18:55:18 +00:00
configure.pro	Clean up building of bootstrap lib and tools	2016-10-11 06:04:54 +00:00
configureapp.cpp	Long live QOperatingSystemVersion!	2016-09-18 21:22:22 +00:00
configureapp.h	Modularize the new configure system (infrastructure part)	2016-09-10 14:04:01 +00:00
environment.cpp	Use the qmake based configuration system also on Windows	2016-08-18 17:10:47 +00:00
environment.h	Use the qmake based configuration system also on Windows	2016-08-18 17:10:47 +00:00
main.cpp	Modularize the new configure system (infrastructure part)	2016-09-10 14:04:01 +00:00
Makefile.mingw	Merge remote-tracking branch 'origin/5.8' into dev	2016-10-13 09:49:38 +02:00
Makefile.win32	Merge remote-tracking branch 'origin/5.8' into dev	2016-10-13 09:49:38 +02:00
tools.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
tools.h	Updated license headers	2016-01-21 18:55:18 +00:00