Merge remote branch 'origin/2.0'

2010-07-13 15:43:48 +02:00
parent f30d5e21cc 3af05a8f67
commit e85d215460
1 changed files with 2 additions and 0 deletions
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -713,7 +713,9 @@ void HelpPlugin::activateContext()
            const QUrl &source = *links.begin();
            const QUrl &oldSource = viewer->source();
            if (source != oldSource) {
+#if !defined(QT_NO_WEBKIT)
                viewer->stop();
+#endif
                viewer->setSource(source);
            }
            viewer->setFocus();