diff options
| author | axis <qt-info@nokia.com> | 2009-08-19 09:24:04 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-08-19 09:24:04 (GMT) |
| commit | 2d1b49bd21b788ba3e35fc5c41bf3aab42cbda65 (patch) | |
| tree | 24dae3a4532870d61282841f6bb186cb008ab747 /src/gui/itemviews/qlistview.cpp | |
| parent | b3a3652abbf1cb4ebba6c6257ecf47f8dc022d93 (diff) | |
| parent | 20d2b7312456435e5e1a98dba7c2cc96b44fe83c (diff) | |
| download | Qt-2d1b49bd21b788ba3e35fc5c41bf3aab42cbda65.zip Qt-2d1b49bd21b788ba3e35fc5c41bf3aab42cbda65.tar.gz Qt-2d1b49bd21b788ba3e35fc5c41bf3aab42cbda65.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
tests/auto/auto.pro
Diffstat (limited to 'src/gui/itemviews/qlistview.cpp')
| -rw-r--r-- | src/gui/itemviews/qlistview.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/itemviews/qlistview.cpp b/src/gui/itemviews/qlistview.cpp index ea38f5f..e9e365f 100644 --- a/src/gui/itemviews/qlistview.cpp +++ b/src/gui/itemviews/qlistview.cpp @@ -458,6 +458,8 @@ QSize QListView::gridSize() const void QListView::setViewMode(ViewMode mode) { Q_D(QListView); + if (d->viewMode == mode) + return; d->viewMode = mode; if (mode == ListMode) { @@ -1963,7 +1965,7 @@ QListViewPrivate::QListViewPrivate() movement(QListView::Static), resizeMode(QListView::Fixed), layoutMode(QListView::SinglePass), - viewMode(QListView::ListMode), + viewMode(QListView::IconMode), //this will ensure the first initialization to ListView modeProperties(0), column(0), uniformItemSizes(false), |