summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkh <qtc-committer@nokia.com>2009-07-01 12:18:57 (GMT)
committerkh <qtc-committer@nokia.com>2009-07-01 12:18:57 (GMT)
commitf6872e6b7a18b946c7428916c7096b82560a9cc6 (patch)
tree7c966cbdeb890d401ddd353a96b09adbe529844e
parentfe889557bcf3f4744205ba65b330276b5dc41c61 (diff)
downloadQt-f6872e6b7a18b946c7428916c7096b82560a9cc6.zip
Qt-f6872e6b7a18b946c7428916c7096b82560a9cc6.tar.gz
Qt-f6872e6b7a18b946c7428916c7096b82560a9cc6.tar.bz2
Do not start Assistant without at least an empty page.
Noticed while looking into task 256903, since in case there are no recent shown pages,we would start Assistant only showning the search. Task-number: 256903 Reviewed-by: kh
-rw-r--r--tools/assistant/tools/assistant/centralwidget.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/assistant/tools/assistant/centralwidget.cpp b/tools/assistant/tools/assistant/centralwidget.cpp
index 385f0bb..64c2a80 100644
--- a/tools/assistant/tools/assistant/centralwidget.cpp
+++ b/tools/assistant/tools/assistant/centralwidget.cpp
@@ -427,8 +427,11 @@ void CentralWidget::setLastShownPages()
QString::SkipEmptyParts);
const int pageCount = lastShownPageList.count();
- if (pageCount == 0 && usesDefaultCollection) {
- setSource(QUrl(QLatin1String("help")));
+ if (pageCount == 0) {
+ if (usesDefaultCollection)
+ setSource(QUrl(QLatin1String("help")));
+ else
+ setSource(QUrl(QLatin1String("about:blank")));
return;
}