AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
fc35f71434
qt5base-lts/tests/auto/widgets/itemviews
History
Frederik Gladhorn fc35f71434 Merge remote-tracking branch 'origin/5.4' into dev 
Conflicts:
	src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
	src/gui/image/qimage_conversions.cpp
	src/gui/opengl/qopenglextensions_p.h
	src/gui/text/qtextengine.cpp
	src/network/ssl/qsslsocket_openssl.cpp
	src/plugins/platforms/eglfs/qeglfshooks_stub.cpp
	src/plugins/platforms/eglfs/qeglfsscreen.cpp
	src/plugins/platforms/eglfs/qeglfswindow.cpp
	src/plugins/platforms/windows/qwindowsfontdatabase.cpp
	src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
	src/plugins/platforms/windows/qwindowsnativeinterface.cpp
	src/plugins/platforms/windows/qwindowsscreen.cpp
	src/plugins/platforms/windows/qwindowswindow.cpp
	src/plugins/platforms/windows/qwindowswindow.h
	src/plugins/platforms/xcb/qxcbdrag.h
	src/widgets/itemviews/qabstractitemview.cpp
	src/widgets/kernel/qwidget.cpp
	src/widgets/util/qsystemtrayicon_p.h
	tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp

Thanks to Friedemann Kleint for resolving the qwindowsfontdatabase.cpp
conflicts.

Change-Id: I937232c30523d5121c195d947d92aec6f129b03e
2015-02-10 09:42:25 +01:00
..
qabstractitemview Allow exposing QItemSelectionModel to QML 2015-02-03 18:40:19 +00:00
qcolumnview Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qdatawidgetmapper QItemDelegate: let QTextEdit and QPlainTextEdit receive tab keypresses 2015-01-04 18:33:49 +01:00
qdirmodel Android: Fix QDirModel tests 2015-01-16 09:27:52 +01:00
qfileiconprovider Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qheaderview QHeaderView: check that length is correct and fix restoring Qt4 state. 2015-02-03 08:45:33 +00:00
qitemdelegate Itemviews: add ItemIsUserTristate flag 2015-01-25 12:37:41 +01:00
qitemeditorfactory Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qitemview Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qlistview Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qlistwidget Implement QTableWidget/QListWidget::mimeData() 2014-10-31 14:06:25 +01:00
qtableview tst_qtableview: fix virtual-override clang warning 2014-11-24 08:05:34 +01:00
qtablewidget Implement QTableWidget/QListWidget::mimeData() 2014-10-31 14:06:25 +01:00
qtreeview Enter/Return should cause an edit inside an itemview on OS X 2015-01-23 10:35:14 +01:00
qtreewidget Merge remote-tracking branch 'origin/5.4' into dev 2015-02-10 09:42:25 +01:00
qtreewidgetitemiterator Update license headers and add new license files 2014-09-24 12:26:19 +02:00
itemviews.pro Move QStandardItem/QStandardItemModel to QtGui 2012-06-29 22:42:19 +02:00