diff options
author | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-14 18:42:19 +0100 |
---|---|---|
committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-14 18:42:25 +0100 |
commit | 463cd4f6563dc12d8b45bf2e293dc64d583e132c (patch) | |
tree | 1d1a6123f42fe8843f32c572cd3d1c4fb42aefcd /tools | |
parent | 4879551f72a377e0816164ce1762eb646839f4a6 (diff) | |
parent | 0295f8da10d6c920511d09f9e506b8bed8c444c3 (diff) | |
download | qt4-tools-463cd4f6563dc12d8b45bf2e293dc64d583e132c.tar.gz |
Merge commit oslo-staging-2/4.6 into upstream/4.6
Diffstat (limited to 'tools')
-rw-r--r-- | tools/assistant/lib/qhelpsearchengine.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/assistant/lib/qhelpsearchengine.h b/tools/assistant/lib/qhelpsearchengine.h index 21f04c5420..632ac0b5a5 100644 --- a/tools/assistant/lib/qhelpsearchengine.h +++ b/tools/assistant/lib/qhelpsearchengine.h @@ -86,7 +86,9 @@ public: QHelpSearchQueryWidget* queryWidget(); QHelpSearchResultWidget* resultWidget(); +#ifdef QT_DEPRECATED QT_DEPRECATED int hitsCount() const; +#endif int hitCount() const; typedef QPair<QString, QString> SearchHit; |