qt5base-lts/mkspecs/macx-icc
Liang Qi 7950b6b283 Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	src/corelib/tools/qbytearray.h
	src/corelib/tools/qdatetime.h
	src/corelib/tools/qstring.h
	src/corelib/tools/qversionnumber.h
	src/plugins/platforms/android/qandroidplatformintegration.cpp
	tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp

Change-Id: Iefd92a435e687a76cd593099e40d9a9620a1454d
2017-04-20 12:31:27 +02:00
..
Info.plist.app qmake: Pick up default bundle prefix from Xcode preferences 2013-10-31 12:33:55 +01:00
Info.plist.dSYM.in qmake: Add support for separate debug info on Apple platforms. 2016-04-14 21:28:54 +00:00
Info.plist.lib Add CFBundleIdentifier to the bundle Info.plist's 2014-11-10 16:04:12 +01:00
qmake.conf Merge remote-tracking branch 'origin/5.9' into dev 2017-04-20 12:31:27 +02:00
qplatformdefs.h Updated license headers 2016-01-15 12:25:24 +00:00