diff options
| author | con <qtc-committer@nokia.com> | 2011-03-09 11:37:59 +0100 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2011-03-09 11:37:59 +0100 |
| commit | 4ed1895c687a0ca685dd494c55f5ecc64941a8f8 (patch) | |
| tree | 1d3f8979f8953a09584ecb8bf1886710f3cb6c61 /src/plugins/help | |
| parent | 9eccbbee5c575e4d5a952321859af773ad32720a (diff) | |
| download | qt-creator-4ed1895c687a0ca685dd494c55f5ecc64941a8f8.tar.gz | |
Revert "F1+F1 behavior was broken if there was no context help found."
This reverts commit 9eccbbee5c575e4d5a952321859af773ad32720a.
After a bit more discussion and considering
2c4eb25168b62e39aba2045977bc1069ebb8d3d7 this wasn't a good idea after
all.
Diffstat (limited to 'src/plugins/help')
| -rw-r--r-- | src/plugins/help/helpplugin.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index 2b7baca982..520ae72255 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -655,17 +655,13 @@ void HelpPlugin::activateHelpMode() void HelpPlugin::switchToHelpMode() { - QUrl source = m_helpViewerForSideBar->source(); - if (source == QUrl(Help::Constants::AboutBlank)) - source = QUrl(); - switchToHelpMode(source); + switchToHelpMode(m_helpViewerForSideBar->source()); } void HelpPlugin::switchToHelpMode(const QUrl &source) { activateHelpMode(); - if (!source.isEmpty()) - m_centralWidget->setSource(source); + m_centralWidget->setSource(source); m_centralWidget->setFocus(); } @@ -881,7 +877,6 @@ void HelpPlugin::activateContext() viewer->setHtml(tr("<html><head><title>No Documentation</title>" "</head><body><br/><center><b>%1</b><br/>No documentation " "available.</center></body></html>").arg(m_idFromContext)); - viewer->setFocus(); // we still want the F1+F1 shortcut behavior } else { int version = 0; const QRegExp exp("(\\d+)"); |