Liang Qi 90c425642d Merge remote-tracking branch 'origin/5.7' into 5.8 ... Conflicts: mkspecs/common/linux-android.conf src/gui/opengl/qopengl.h src/network/socket/qnativesocketengine_winrt.cpp src/network/socket/qnativesocketengine_winrt_p.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/eglfs/api/qeglfsintegration.cpp src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp sync.profile Change-Id: If70aaf2c49df91157b864cf0d7d9513546c9bec4		2016-11-16 12:35:36 +01:00
..
unsupported	Add tool to namespace Objective-C classes at link time	2016-01-29 14:41:21 +00:00
asset_catalogs.prf	qmake: fix installation of asset catalog files	2016-11-14 15:48:41 +00:00
default_post.prf	fix QMAKE_DEFAULT_*DIRS resolution with apple SDK, take 2	2016-10-16 00:12:11 +00:00
default_pre.prf	fix QMAKE_DEFAULT_*DIRS resolution with apple SDK, take 2	2016-10-16 00:12:11 +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	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
sdk.prf	Get rid of simulator_and_device CONFIG option (mostly)	2016-10-16 00:11:59 +00:00
toolchain.prf	fix QMAKE_DEFAULT_*DIRS resolution with apple SDK, take 2	2016-10-16 00:12:11 +00:00