diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-12 12:46:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-12 12:46:23 (GMT) |
| commit | f0915d4a19f30b3ec0e0ee1c538e11be6b43a7b3 (patch) | |
| tree | 72a401f29b4b411fc072e2cbdc080cf2f66686aa /src/gui/itemviews/qtreeview_p.h | |
| parent | fc3ef51ef7344e189699e62ec54f3ce469c553f9 (diff) | |
| parent | 4f1b0d758e42872d2852e0eedd2417a858d603e2 (diff) | |
| download | Qt-f0915d4a19f30b3ec0e0ee1c538e11be6b43a7b3.zip Qt-f0915d4a19f30b3ec0e0ee1c538e11be6b43a7b3.tar.gz Qt-f0915d4a19f30b3ec0e0ee1c538e11be6b43a7b3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Removed a Valgrind warning.
Made QGLExtensions::glExtensions() thread-safe.
QTreeView: Optimise QTreeViewPrivate::viewIndex
Optimize QSortFilterProxyModel
QTreeView: speedup more QTreeViewPrivate::layout(-1)
Remove debug output from qt_eglproperties_set_glformat
Delete the QGLContext in ~QX11GLPixmapData
Made QGLTextureCache::instance() threadsafe.
Add support for QFont::NoAntialias on QWS
Fix 1-bit to 8-bit conversion for bitmap fonts on QWS
Diffstat (limited to 'src/gui/itemviews/qtreeview_p.h')
| -rw-r--r-- | src/gui/itemviews/qtreeview_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/itemviews/qtreeview_p.h b/src/gui/itemviews/qtreeview_p.h index 7893e04..48997b7 100644 --- a/src/gui/itemviews/qtreeview_p.h +++ b/src/gui/itemviews/qtreeview_p.h @@ -55,6 +55,7 @@ #include "private/qabstractitemview_p.h" #include <QtCore/qvariantanimation.h> +#include <QtCore/qabstractitemmodel.h> #ifndef QT_NO_TREEVIEW @@ -75,6 +76,8 @@ struct QTreeViewItem int height : 16; // row height }; +Q_DECLARE_TYPEINFO(QTreeViewItem, Q_MOVABLE_TYPE); + class QTreeViewPrivate : public QAbstractItemViewPrivate { Q_DECLARE_PUBLIC(QTreeView) @@ -124,7 +127,7 @@ public: void _q_sortIndicatorChanged(int column, Qt::SortOrder order); void _q_modelDestroyed(); - void layout(int item); + void layout(int item, bool recusiveExpanding = false, bool afterIsUninitialized = false); int pageUp(int item) const; int pageDown(int item) const; |