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
..
.gitattributes	…
.gitignore	…
BLACKLIST	Extend blacklisting of tst_qsettings to OSX 10.11	2015-12-15 09:45:51 +00:00
bom.ini	Properly detect UTF-8 BOM markers in ini files	2014-10-29 08:58:31 +01:00
qsettings.pro	Don't truncate QDateTime milliseconds when storing QSettings on Apple platforms	2016-10-05 18:45:04 +00:00
qsettings.qrc	Properly detect UTF-8 BOM markers in ini files	2014-10-29 08:58:31 +01:00
resourcefile.ini	…
resourcefile2.ini	…
resourcefile3.ini	…
resourcefile4.ini	…
resourcefile5.ini	…
tst_qsettings.cpp	Merge remote-tracking branch 'origin/5.8' into dev	2016-10-13 09:49:38 +02:00