Liang Qi 5cfb80a28e Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/angle/src/libGLESv2/libGLESv2.pro src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp Change-Id: If8da4cfe8f57fea9f78e7239f378a6302c01674e		2016-06-23 10:29:37 +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.6' into 5.7	2016-06-23 10:29:37 +02:00
qplatformdefs.h	Updated license headers	2016-01-15 12:25:24 +00:00