diff options
| author | axis <qt-info@nokia.com> | 2009-12-16 08:37:34 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-12-16 08:37:34 (GMT) |
| commit | 6e527912d719b0448b91eba1d6a99b9cbe58170a (patch) | |
| tree | 17ba94b2af34ba2ab953fbd7be84955bdea39370 /tools/assistant/lib/qhelpsearchengine.h | |
| parent | 8152bd167c1a728c54a9976297bb53e09d131d66 (diff) | |
| parent | a9d4faa330698a7972c7fa4b3582fb20548b32f6 (diff) | |
| download | Qt-6e527912d719b0448b91eba1d6a99b9cbe58170a.zip Qt-6e527912d719b0448b91eba1d6a99b9cbe58170a.tar.gz Qt-6e527912d719b0448b91eba1d6a99b9cbe58170a.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Conflicts:
src/s60installs/bwins/QtGuiu.def
Diffstat (limited to 'tools/assistant/lib/qhelpsearchengine.h')
| -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 21f04c5..632ac0b 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; |