diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-10 14:36:53 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-10 14:36:53 +0100 |
| commit | 7b15c669c336a1d76e3ac001fadde38a294e3e80 (patch) | |
| tree | 2b8e9631019d1bc9af37d9a93bb93ce0eb16381a /tools/assistant/tools/assistant/bookmarkmanager.cpp | |
| parent | 47bc34f413d9a0c6efac6ca3eead95eed7da2e40 (diff) | |
| parent | 86048e1a09fce11f557d0e8b117229a754ee9098 (diff) | |
Merge branch 'tools-team/4.6' (early part) into 4.6
Conflicts:
src/corelib/tools/qscopedpointer.h
Diffstat (limited to 'tools/assistant/tools/assistant/bookmarkmanager.cpp')
| -rw-r--r-- | tools/assistant/tools/assistant/bookmarkmanager.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/assistant/tools/assistant/bookmarkmanager.cpp b/tools/assistant/tools/assistant/bookmarkmanager.cpp index 9cccd82a32..511a56ec6f 100644 --- a/tools/assistant/tools/assistant/bookmarkmanager.cpp +++ b/tools/assistant/tools/assistant/bookmarkmanager.cpp @@ -621,6 +621,7 @@ Qt::ItemFlags BookmarkModel::flags(const QModelIndex &index) const BookmarkManager::BookmarkManager(QHelpEngineCore *_helpEngine) : treeModel(new BookmarkModel(0, 1, this)) , listModel(new BookmarkModel(0, 1, this)) + , renameItem(0) , helpEngine(_helpEngine) { folderIcon = QApplication::style()->standardIcon(QStyle::SP_DirClosedIcon); |