feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Don't open a help page while swtiching to 'Contents'. New default home.

Browse Source 
Reviewed-by: ck
This commit is contained in:
kh1
2010-03-10 15:02:24 +01:00
parent cf76634aff
commit 98a0663e0d
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/help/helpplugin.cpp
View File

@@ -686,13 +686,10 @@ void HelpPlugin::extensionsInitialized()
webSettings->setFontSize(QWebSettings::DefaultFontSize, font.pointSize()); webSettings->setFontSize(QWebSettings::DefaultFontSize, font.pointSize());
#endif #endif
QUrl url = m_helpEngine->findFile(QString::fromLatin1("qthelp://com." const QString &url = QString::fromLatin1("qthelp://com.nokia.qtcreator."
"trolltech.qt.440/qdoc/index.html")); "%1%2%3/doc/index.html").arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR)
if (!url.isValid()) { .arg(IDE_VERSION_RELEASE);
url.setUrl(QString::fromLatin1("qthelp://com.nokia.qtcreator.%1%2/doc/" m_helpEngine->setCustomValue(QLatin1String("DefaultHomePage"), url);
"index.html").arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR));
}
m_helpEngine->setCustomValue(QLatin1String("DefaultHomePage"), url.toString());
connect(m_centralWidget, SIGNAL(sourceChanged(QUrl)), this, connect(m_centralWidget, SIGNAL(sourceChanged(QUrl)), this,
SLOT(rebuildViewerComboBox())); SLOT(rebuildViewerComboBox()));
@@ -914,9 +911,6 @@ void HelpPlugin::activateContents()
{ {
activateHelpMode(); activateHelpMode();
m_sideBar->activateItem(m_contentItem); m_sideBar->activateItem(m_contentItem);
openHelpPage(QString::fromLatin1("qthelp://com.nokia.qtcreator.%1%2%3/doc/"
"index.html").arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR)
.arg(IDE_VERSION_RELEASE));
} }
void HelpPlugin::activateSearch() void HelpPlugin::activateSearch()