summaryrefslogtreecommitdiffstats
path: root/tools/assistant
diff options
context:
space:
mode:
authorkh1 <qt-info@nokia.com>2010-08-27 12:38:41 (GMT)
committerkh1 <qt-info@nokia.com>2010-08-27 12:38:41 (GMT)
commitb2a76f5265dd177f30bb5eda83fb06b39ddf0b5c (patch)
treeafa94cb89c172370b2fddd49faf73d3ac6ab3b4d /tools/assistant
parent6078989c33aaea5836d179f7bc8e666f3622ab97 (diff)
downloadQt-b2a76f5265dd177f30bb5eda83fb06b39ddf0b5c.zip
Qt-b2a76f5265dd177f30bb5eda83fb06b39ddf0b5c.tar.gz
Qt-b2a76f5265dd177f30bb5eda83fb06b39ddf0b5c.tar.bz2
Fix broken bookmark filter.
Diffstat (limited to 'tools/assistant')
-rw-r--r--tools/assistant/tools/assistant/bookmarkmanager.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/assistant/tools/assistant/bookmarkmanager.cpp b/tools/assistant/tools/assistant/bookmarkmanager.cpp
index 65888fe..eb5a37a 100644
--- a/tools/assistant/tools/assistant/bookmarkmanager.cpp
+++ b/tools/assistant/tools/assistant/bookmarkmanager.cpp
@@ -158,6 +158,8 @@ BookmarkManager::BookmarkManager()
: typeAndSearch(false)
, bookmarkMenu(0)
, bookmarkModel(new BookmarkModel)
+ , bookmarkFilterModel(0)
+ , typeAndSearchModel(0)
, bookmarkWidget(new BookmarkWidget)
, bookmarkTreeView(new BookmarkTreeView)
, bookmarkManagerWidget(0)
@@ -316,11 +318,13 @@ void BookmarkManager::setupFinished()
bookmarkTreeView->header()->setVisible(false);
bookmarkTreeView->header()->setStretchLastSection(true);
- bookmarkFilterModel = new BookmarkFilterModel(this);
+ if (!bookmarkFilterModel)
+ bookmarkFilterModel = new BookmarkFilterModel(this);
bookmarkFilterModel->setSourceModel(bookmarkModel);
bookmarkFilterModel->filterBookmarkFolders();
- typeAndSearchModel = new QSortFilterProxyModel(this);
+ if (!typeAndSearchModel)
+ typeAndSearchModel = new QSortFilterProxyModel(this);
typeAndSearchModel->setDynamicSortFilter(true);
typeAndSearchModel->setSourceModel(bookmarkFilterModel);
}