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
..
mingw_make.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00
mingw_make.h	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-26 16:27:28 +01:00
msbuild_objectmodel.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-11-15 09:58:16 +01:00
msbuild_objectmodel.h	Updated license headers	2016-01-21 18:55:18 +00:00
msvc_nmake.cpp	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-01 06:02:55 +01:00
msvc_nmake.h	Updated license headers	2016-01-21 18:55:18 +00:00
msvc_objectmodel.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-11-15 09:58:16 +01:00
msvc_objectmodel.h	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-16 12:35:36 +01:00
msvc_vcproj.cpp	win32: Fix Visual Studio project generation	2016-09-22 09:36:18 +00:00
msvc_vcproj.h	Updated license headers	2016-01-21 18:55:18 +00:00
msvc_vcxproj.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
msvc_vcxproj.h	Updated license headers	2016-01-21 18:55:18 +00:00
winmakefile.cpp	Remove Windows CE vestige	2016-06-20 12:51:43 +00:00
winmakefile.h	Updated license headers	2016-01-21 18:55:18 +00:00