diff options
author | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-08-19 11:57:27 (GMT) |
---|---|---|
committer | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-08-19 11:57:27 (GMT) |
commit | d9e03376f9f82e5664dfd2446ff4c05e35ffb535 (patch) | |
tree | 711f77f7d307c05a3ae310b1fd59bbce74bd8eab /src/gui/itemviews/qlistview.cpp | |
parent | 98d4c657803d5f1956560bd9b62e73f15c05e8fd (diff) | |
parent | ca0b5b503e8865c0eedeea86aa132291281fc49f (diff) | |
download | Qt-d9e03376f9f82e5664dfd2446ff4c05e35ffb535.zip Qt-d9e03376f9f82e5664dfd2446ff4c05e35ffb535.tar.gz Qt-d9e03376f9f82e5664dfd2446ff4c05e35ffb535.tar.bz2 |
Merged in DummyPlayer changes
Diffstat (limited to 'src/gui/itemviews/qlistview.cpp')
-rw-r--r-- | src/gui/itemviews/qlistview.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/gui/itemviews/qlistview.cpp b/src/gui/itemviews/qlistview.cpp index 148d204..ea38f5f 100644 --- a/src/gui/itemviews/qlistview.cpp +++ b/src/gui/itemviews/qlistview.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE \ingroup model-view \ingroup advanced - \mainclass + A QListView presents items stored in a model, either as a simple non-hierarchical list, or as a collection of icons. This class is used @@ -1957,7 +1957,6 @@ bool QListView::event(QEvent *e) QListViewPrivate::QListViewPrivate() : QAbstractItemViewPrivate(), dynamicListView(0), - staticListView(0), wrap(false), space(0), flow(QListView::TopToBottom), @@ -1968,14 +1967,17 @@ QListViewPrivate::QListViewPrivate() modeProperties(0), column(0), uniformItemSizes(false), - batchSize(100) + batchSize(100), + showElasticBand(false) { } QListViewPrivate::~QListViewPrivate() { - delete staticListView; - delete dynamicListView; + if (viewMode == QListView::ListMode) + delete staticListView; + else + delete dynamicListView; } void QListViewPrivate::clear() |