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
..
Makefile.mingw	Clean up building of bootstrap lib and tools	2016-10-11 06:04:54 +00:00
Makefile.win32	Clean up building of bootstrap lib and tools	2016-10-11 06:04:54 +00:00
configure.pro	Clean up building of bootstrap lib and tools	2016-10-11 06:04:54 +00:00
configure_pch.h	Updated license headers	2016-01-21 18:55:18 +00:00
configureapp.cpp	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-16 12:35:36 +01:00
configureapp.h	Modularize the new configure system (infrastructure part)	2016-09-10 14:04:01 +00:00
environment.cpp	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-01 06:02:55 +01:00
environment.h	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-09-16 23:16:25 +02:00
main.cpp	Modularize the new configure system (infrastructure part)	2016-09-10 14:04:01 +00:00
tools.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
tools.h	Updated license headers	2016-01-21 18:55:18 +00:00