diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-29 01:28:54 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-29 01:28:54 (GMT) |
| commit | dd400b8eda22e6a1261b1178a290939f309d0a12 (patch) | |
| tree | 0e0a270f85f91c4b03039d2ae72e259142a8d382 /src/gui/itemviews/itemviews.pri | |
| parent | bc0d5838a3bb884c1de782145ce0d8501710c883 (diff) | |
| parent | 391f14b54c3e716fc624b93fe116e9b4248b0bd8 (diff) | |
| download | Qt-dd400b8eda22e6a1261b1178a290939f309d0a12.zip Qt-dd400b8eda22e6a1261b1178a290939f309d0a12.tar.gz Qt-dd400b8eda22e6a1261b1178a290939f309d0a12.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: (49 commits)
Make QLineControl send accessibility updates.
Fix warning (unused variable) in QAccessibility test.
Add accessible events as defined by IAccessible2.
Return name and allow actions for invisible accessible items.
Skip child count test on Intel compiler.
Removing the "resetInternalData" slot in QAbstractProxyModel
Typos in internal api docs.
Fix tst_QTableWidget::task219380_removeLastRow
Fix tst_QTableWidget::task219380_removeLastRow
Fixed a crash on Windows XP with mingw in threaded-code
Totally kill MR 916
Fix licence headers again for MR 900
Reverting merge request 916
Reverting merge request 916
Build fix on QMenuBar
Fix licence headers again for MR 900
Fix copyright and a few codestyle mistakes
Renamed QAbstractMenuBarImpl to QAbstractMenuBarInterface
Make ctor and dtor of QAbstractMenuBarImpl inline
QAbstractMenuBarImpl::allowSetVisible => setVisible
...
Diffstat (limited to 'src/gui/itemviews/itemviews.pri')
| -rw-r--r-- | src/gui/itemviews/itemviews.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/itemviews/itemviews.pri b/src/gui/itemviews/itemviews.pri index bbc1e98..149bfd6 100644 --- a/src/gui/itemviews/itemviews.pri +++ b/src/gui/itemviews/itemviews.pri @@ -4,6 +4,7 @@ HEADERS += \ itemviews/qabstractitemview.h \ itemviews/qabstractitemview_p.h \ itemviews/qheaderview.h \ + itemviews/qidentityproxymodel.h \ itemviews/qlistview.h \ itemviews/qlistview_p.h \ itemviews/qbsptree_p.h \ @@ -44,6 +45,7 @@ HEADERS += \ SOURCES += \ itemviews/qabstractitemview.cpp \ itemviews/qheaderview.cpp \ + itemviews/qidentityproxymodel.cpp \ itemviews/qlistview.cpp \ itemviews/qbsptree.cpp \ itemviews/qtableview.cpp \ |