AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a7adf3ea1d
qt5base-lts/config.tests/qpa
History
Liang Qi 818014b449 Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	configure
	src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
	src/network/access/qnetworkaccessmanager.cpp
	src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h
	src/widgets/widgets/qlineedit_p.cpp
	src/widgets/widgets/qlineedit_p.h
	src/winmain/winmain.pro
	tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
	tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
	tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h
	tests/auto/testlib/selftests/expected_cmptest.teamcity
	tests/auto/testlib/selftests/expected_cmptest.txt
	tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
	tools/configure/configureapp.cpp

Change-Id: Ib9997b0d0f91946e4081d36c0c6b696c5c983b2a
2016-05-19 12:55:27 +02:00
..
direct2d Updated license headers 2016-01-15 12:25:24 +00:00
directfb Update the Intel copyright year 2016-01-21 22:44:16 +00:00
egl Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-13 06:55:37 +02:00
egl-x11 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-13 06:55:37 +02:00
eglfs-brcm Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-13 06:55:37 +02:00
eglfs-egldevice Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-13 06:55:37 +02:00
eglfs-mali Updated license headers 2016-01-15 12:25:24 +00:00
eglfs-mali-2 Updated license headers 2016-01-15 12:25:24 +00:00
eglfs-viv eglfs-viv: Fix config test 2016-05-15 17:46:37 +00:00
gbm Updated license headers 2016-01-15 12:25:24 +00:00
kms Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
linuxfb Updated license headers 2016-01-15 12:25:24 +00:00
mirclient Updated license headers 2016-01-15 12:25:24 +00:00
wayland-server Updated license headers 2016-01-15 12:25:24 +00:00
xcb Updated license headers 2016-01-15 12:25:24 +00:00
xcb-glx Updated license headers 2016-01-15 12:25:24 +00:00
xcb-render Updated license headers 2016-01-15 12:25:24 +00:00
xcb-syslibs Updated license headers 2016-01-15 12:25:24 +00:00
xcb-xkb Updated license headers 2016-01-15 12:25:24 +00:00
xcb-xlib Updated license headers 2016-01-15 12:25:24 +00:00