AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
818014b449
qt5base-lts/src
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
..
3rdparty Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
android Android: Bring back the useful public vars 2016-04-30 12:05:21 +00:00
angle Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
concurrent Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
corelib Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
dbus Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
gui Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
network Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
opengl Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
openglextensions QtConcurrent/QtOpenGL(Extensions)/QtPrintSupport/QtTestLib/QtXml: add QT_NO_FOREACH 2016-05-12 21:42:10 +00:00
platformheaders Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
platformsupport Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
plugins Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
printsupport Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
sql Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
testlib Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
tools Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
widgets Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
winmain Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
xml Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
src.pro Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00