diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-13 10:59:01 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-13 10:59:01 (GMT) |
| commit | f1aeeb025c5042f6684855006f963e2203d9c153 (patch) | |
| tree | 430cbdfa0c42e23289f7cd4b5907656810dbe895 /tools/assistant/lib/qhelpenginecore.cpp | |
| parent | 168524d4f642724fe9063500c0c39ab747f145b6 (diff) | |
| parent | 88412920c58286d22aaa1e121b1030298adf86eb (diff) | |
| download | Qt-f1aeeb025c5042f6684855006f963e2203d9c153.zip Qt-f1aeeb025c5042f6684855006f963e2203d9c153.tar.gz Qt-f1aeeb025c5042f6684855006f963e2203d9c153.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
tools/qdoc3/test/qt-build-docs.qdocconf
Diffstat (limited to 'tools/assistant/lib/qhelpenginecore.cpp')
| -rw-r--r-- | tools/assistant/lib/qhelpenginecore.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/assistant/lib/qhelpenginecore.cpp b/tools/assistant/lib/qhelpenginecore.cpp index 140e99a..c83d12c 100644 --- a/tools/assistant/lib/qhelpenginecore.cpp +++ b/tools/assistant/lib/qhelpenginecore.cpp @@ -404,8 +404,9 @@ QStringList QHelpEngineCore::customFilters() const /*! Adds the new custom filter \a filterName. The filter attributes - are specified by \a attributes. The function returns false if - the filter can not be added, e.g. when the filter already exists. + are specified by \a attributes. If the filter already exists, + its attribute set is replaced. The function returns true if + the operation succeeded, otherwise it returns false. \sa customFilters(), removeCustomFilter() */ |