qt5base-lts/mkspecs/macx-icc
Liang Qi b131503361 Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
	configure
	configure.pri
	examples/widgets/painting/fontsampler/mainwindow.cpp
	examples/widgets/painting/fontsampler/mainwindow.h
	mkspecs/features/moc.prf
	src/corelib/global/qglobal.h
	src/gui/text/qtextdocument.cpp

Change-Id: Ica65512e00871695190a14ccea5c275b0165f787
2016-12-16 16:38:33 +01: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.8' into dev 2016-12-16 16:38:33 +01:00
qplatformdefs.h Updated license headers 2016-01-15 12:25:24 +00:00