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
..
qicoimageformat	Merge remote-tracking branch 'origin/5.7' into dev	2016-05-23 21:09:46 +02:00
qicon	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-13 12:46:46 +02:00
qimage	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00
qimageiohandler	Updated license headers	2016-01-21 18:55:18 +00:00
qimagereader	Remove the traces of the discontinued android-no-sdk platform	2016-03-30 10:12:34 +00:00
qimagewriter	Fix output location for generated files	2016-09-02 04:58:53 +00:00
qmovie	Modularize configure.json/.pri	2016-09-15 08:23:53 +00:00
qpicture	Updated license headers	2016-01-21 18:55:18 +00:00
qpixmap	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-16 12:35:36 +01:00
qpixmapcache	Updated license headers	2016-01-21 18:55:18 +00:00
image.pro	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00