Liang Qi b36c5bdc30 Merge remote-tracking branch 'origin/5.11' into 5.12.0 ... Conflicts: src/plugins/platforms/cocoa/qcocoaglcontext.mm src/plugins/platforms/xcb/qxcbscreen.h Change-Id: If9b4c67288396ff7346088ce591c7a3588b51979		2018-11-05 09:59:59 +01:00
..
unsupported	…
asset_catalogs.prf	qmake: add support for launch images in asset catalogs	2016-12-22 22:27:46 +00:00
default_post.prf	Merge remote-tracking branch 'origin/5.11' into 5.12.0	2018-11-05 09:59:59 +01:00
default_pre.prf	Fix build of applications on iOS	2018-05-13 08:48:53 +00:00
mac.prf	Fix resolution of QMAKE_INFO_PLIST for non-bundle artifacts	2017-10-23 13:50:45 +00:00
objective_c.prf	unset OBJECTIVE_SOURCES and QMAKE_OBJECTIVE_CFLAGS after absorbing them	2016-10-25 17:49:49 +00:00
rez.prf	…
sdk.mk	macOS: Only detect changes to the SDK version within the same developer dir	2018-10-25 08:59:45 +00:00
sdk.prf	qmake: fix sdk resolution on macos	2018-04-18 19:10:19 +00:00
toolchain.prf	fix QMAKE_DEFAULT_*DIRS resolution with apple SDK, take 2	2016-10-16 00:12:11 +00:00