summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJustin McPherson <justin.mcpherson@nokia.com>2009-12-14 22:59:42 (GMT)
committerJustin McPherson <justin.mcpherson@nokia.com>2009-12-14 22:59:42 (GMT)
commit33d6cfe679d4374af90598a6003ac5bca3c032ef (patch)
tree734c861a05d9e79bca54ecb8cb7a3c3cb209a576 /tools
parentcce709287279a8dd5ac17ed4c9dd09ebb78c4f27 (diff)
parent463cd4f6563dc12d8b45bf2e293dc64d583e132c (diff)
downloadQt-33d6cfe679d4374af90598a6003ac5bca3c032ef.zip
Qt-33d6cfe679d4374af90598a6003ac5bca3c032ef.tar.gz
Qt-33d6cfe679d4374af90598a6003ac5bca3c032ef.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tools')
-rw-r--r--tools/assistant/lib/qhelpsearchengine.h2
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;