diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-03-17 12:19:10 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-03-17 12:19:10 (GMT) |
| commit | 63520c42a85cc4b3d7e5da6f14b6e12774274fef (patch) | |
| tree | 7229b0e3bdf624f3d07906027d40085075c1aec6 /tools/assistant/lib/qhelpcontentwidget.cpp | |
| parent | 8a5cd17c49888e5b6cb230516e1722af9adba251 (diff) | |
| parent | ed08d67fea713e550da0fd0542672cc4443806e2 (diff) | |
| download | Qt-63520c42a85cc4b3d7e5da6f14b6e12774274fef.zip Qt-63520c42a85cc4b3d7e5da6f14b6e12774274fef.tar.gz Qt-63520c42a85cc4b3d7e5da6f14b6e12774274fef.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
configure.exe
src/declarative/util/qdeclarativelistmodel.cpp
tools/qml/qml.pro
Diffstat (limited to 'tools/assistant/lib/qhelpcontentwidget.cpp')
| -rw-r--r-- | tools/assistant/lib/qhelpcontentwidget.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/assistant/lib/qhelpcontentwidget.cpp b/tools/assistant/lib/qhelpcontentwidget.cpp index a80dc39..6f3f942 100644 --- a/tools/assistant/lib/qhelpcontentwidget.cpp +++ b/tools/assistant/lib/qhelpcontentwidget.cpp @@ -370,7 +370,8 @@ void QHelpContentModel::invalidateContents(bool onShutDown) delete d->rootItem; d->rootItem = 0; } - reset(); + if (!onShutDown) + reset(); } /*! |