AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
cbe332405a
qt5base-lts/tests/auto/widgets/itemviews
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
..
qabstractitemview Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-24 20:37:33 +01:00
qcolumnview Updated license headers 2016-01-21 18:55:18 +00:00
qdatawidgetmapper Updated license headers 2016-01-21 18:55:18 +00:00
qdirmodel Remove the traces of the discontinued android-no-sdk platform 2016-03-30 10:12:34 +00:00
qfileiconprovider Updated license headers 2016-01-21 18:55:18 +00:00
qheaderview Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-27 09:18:05 +02:00
qitemdelegate Updated license headers 2016-01-21 18:55:18 +00:00
qitemeditorfactory Updated license headers 2016-01-21 18:55:18 +00:00
qitemview Updated license headers 2016-01-21 18:55:18 +00:00
qlistview Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
qlistwidget QListWidget: setup connections when changing selection model. 2016-02-21 20:50:18 +00:00
qtableview Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
qtablewidget Updated license headers 2016-01-21 18:55:18 +00:00
qtreeview Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-24 13:31:14 +01:00
qtreewidget Updated license headers 2016-01-21 18:55:18 +00:00
qtreewidgetitemiterator Updated license headers 2016-01-21 18:55:18 +00:00
itemviews.pro Move QStandardItem/QStandardItemModel to QtGui 2012-06-29 22:42:19 +02:00