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
..
cocoafunctions	Unify license header usage.	2016-03-29 10:20:03 +00:00
doc	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-06 09:04:55 +02:00
eglfsfunctions	Unify license header usage.	2016-03-29 10:20:03 +00:00
helper	Updated license headers	2016-01-15 12:25:24 +00:00
nativecontexts	create modularized version of qtplatformsupport module	2016-10-15 18:45:33 +00:00
waylandfunctions	Move waylandfunctions from qtwayland to qtbase	2016-02-11 12:58:29 +00:00
windowsfunctions	Unify license header usage.	2016-03-29 10:20:03 +00:00
xcbfunctions	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-11-15 09:58:16 +01:00
platformheaders.pro	Move waylandfunctions from qtwayland to qtbase	2016-02-11 12:58:29 +00:00