Merge remote branch 'origin/2.0'

e85d2154 · con · f30d5e21 · 3af05a8f · e85d2154
Commit e85d2154 authored Jul 13, 2010 by con
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

src/plugins/help/helpplugin.cpp src/plugins/help/helpplugin.cpp +2 -0

No files found.
--- 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();