diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-13 16:03:27 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-13 16:03:27 (GMT) |
| commit | 149b13bdec3802a80e86a0de77837d7e9cbab8af (patch) | |
| tree | 41a76edb43874b11d36f53c745a3e40393feb52f /tools/assistant/lib | |
| parent | cf44101e03eb33caa7c37fbd8023c2948b7f0249 (diff) | |
| parent | 0c52573b646d8f139f37c26c954d03061ddb485a (diff) | |
| download | Qt-149b13bdec3802a80e86a0de77837d7e9cbab8af.zip Qt-149b13bdec3802a80e86a0de77837d7e9cbab8af.tar.gz Qt-149b13bdec3802a80e86a0de77837d7e9cbab8af.tar.bz2 | |
Merge branch '4.6'
Diffstat (limited to 'tools/assistant/lib')
| -rw-r--r-- | tools/assistant/lib/qhelpenginecore.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tools/assistant/lib/qhelpenginecore.cpp b/tools/assistant/lib/qhelpenginecore.cpp index 80b92fd..c83d12c 100644 --- a/tools/assistant/lib/qhelpenginecore.cpp +++ b/tools/assistant/lib/qhelpenginecore.cpp @@ -177,12 +177,11 @@ void QHelpEngineCorePrivate::errorReceived(const QString &msg) instead. When creating a custom help viewer the viewer can be -configured by writing a custom collection file which could contain various -keywords to be used to configure the help engine. These keywords and values -and their meaning can be found in the help information for -\l{assistant-custom-help-viewer.html#creating-a-custom-help-collection-file -}{creating a custom help collection file} for -Assistant. + configured by writing a custom collection file which could contain various + keywords to be used to configure the help engine. These keywords and values + and their meaning can be found in the help information for + \l{assistant-custom-help-viewer.html#creating-a-custom-help-collection-file} + {creating a custom help collection file} for Assistant. */ /*! |