Sync with Assistant source, fixes empty tab title.

1 files changed, 14 insertions, 14 deletions

diff --git a/src/plugins/help/centralwidget.cpp b/src/plugins/help/centralwidget.cpp
index 89d711722b..787d047535 100644
--- a/src/plugins/help/centralwidget.cpp
+++ b/src/plugins/help/centralwidget.cpp
@@ -153,7 +153,11 @@ CentralWidget *CentralWidget::instance()
 void CentralWidget::newTab()
 {
     HelpViewer* viewer = currentHelpViewer();
+#if !defined(QT_NO_WEBKIT)
+    if (viewer && viewer->hasLoadFinished())
+#else
     if (viewer)
+#endif
         setSourceInNewTab(viewer->source());
 }
 
@@ -500,26 +504,22 @@ void CentralWidget::activateTab(bool onlyHelpViewer)
 
 void CentralWidget::setTabTitle(const QUrl& url)
 {
-    int tab = lastTabPage;
-    HelpViewer* viewer = currentHelpViewer();
-
+    Q_UNUSED(url)
 #if !defined(QT_NO_WEBKIT)
-    if (!viewer || viewer->source() != url) {
         QTabBar *tabBar = qFindChild<QTabBar*>(tabWidget);
-        for (tab = 0; tab < tabBar->count(); ++tab) {
-            viewer = qobject_cast<HelpViewer*>(tabWidget->widget(tab));
-            if (viewer && viewer->source() == url)
-                break;
+        for (int i = 0; i < tabBar->count(); ++i) {
+            HelpViewer* view = qobject_cast<HelpViewer*>(tabWidget->widget(i));
+            if (view) {
+                tabWidget->setTabText(i,
+                    quoteTabTitle(view->documentTitle().trimmed()));
+            }
         }
-    }
 #else
-    Q_UNUSED(url)
-#endif
-
-    if (viewer) {
-        tabWidget->setTabText(tab,
+    if (HelpViewer* viewer = currentHelpViewer()) {
+        tabWidget->setTabText(lastTabPage,
             quoteTabTitle(viewer->documentTitle().trimmed()));
     }
+#endif
 }
 
 void CentralWidget::currentPageChanged(int index)