diff options
| author | con <qtc-committer@nokia.com> | 2010-06-08 10:39:45 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-06-08 10:39:45 +0200 |
| commit | 7f733b15458aa7e2bb59a1fb0c45e4b9a0f8e081 (patch) | |
| tree | 2947a0ae81e06e3c7f1ccd87f37fcb4e6a2f0dad /src/plugins/welcome | |
| parent | 310194cb9f5fa8e376802ade203819756edef63d (diff) | |
| parent | 4b2bbfe67338497772d36ade2daae47650fb7d98 (diff) | |
Merge remote branch 'origin/2.0'
Conflicts:
README
doc/qt-html-templates.qdocconf
doc/qtcreator.qdoc
doc/qtcreator.qdocconf
src/app/Info.plist
src/plugins/bineditor/BinEditor.pluginspec
src/plugins/bookmarks/Bookmarks.pluginspec
src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
src/plugins/coreplugin/Core.pluginspec
src/plugins/coreplugin/coreconstants.h
src/plugins/cpaster/CodePaster.pluginspec
src/plugins/cppeditor/CppEditor.pluginspec
src/plugins/cpptools/CppTools.pluginspec
src/plugins/cvs/CVS.pluginspec
src/plugins/debugger/Debugger.pluginspec
src/plugins/designer/Designer.pluginspec
src/plugins/fakevim/FakeVim.pluginspec
src/plugins/find/Find.pluginspec
src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
src/plugins/git/ScmGit.pluginspec
src/plugins/helloworld/HelloWorld.pluginspec
src/plugins/help/Help.pluginspec
src/plugins/locator/Locator.pluginspec
src/plugins/mercurial/Mercurial.pluginspec
src/plugins/perforce/Perforce.pluginspec
src/plugins/projectexplorer/ProjectExplorer.pluginspec
src/plugins/qmldesigner/QmlDesigner.pluginspec
src/plugins/qmlinspector/QmlInspector.pluginspec
src/plugins/qmljseditor/QmlJSEditor.pluginspec
src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
src/plugins/regexp/RegExp.pluginspec
src/plugins/resourceeditor/ResourceEditor.pluginspec
src/plugins/snippets/Snippets.pluginspec
src/plugins/subversion/Subversion.pluginspec
src/plugins/texteditor/TextEditor.pluginspec
src/plugins/vcsbase/VCSBase.pluginspec
src/plugins/welcome/Welcome.pluginspec
Diffstat (limited to 'src/plugins/welcome')
| -rw-r--r-- | src/plugins/welcome/welcomemode.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/welcome/welcomemode.h b/src/plugins/welcome/welcomemode.h index 3779bf434b..42acdb7378 100644 --- a/src/plugins/welcome/welcomemode.h +++ b/src/plugins/welcome/welcomemode.h @@ -62,7 +62,7 @@ public: QString id() const; QList<int> context() const; void activated(); - QString contextHelpId() const { return QLatin1String("Qt Creator"); } + QString contextHelpId() const { return QLatin1String("Qt Creator Manual"); } void initPlugins(); private slots: |