diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-15 09:47:54 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-15 09:47:54 (GMT) |
| commit | fcf91a2d527b393a366c997dd225c076afe34718 (patch) | |
| tree | 0c8027b9f1059a5c63e777838fb4bf45b72293fc /tools/assistant | |
| parent | efa48b0a5dba8c8c93612e534d04b5b04629b75c (diff) | |
| parent | 1a867a3c692e375565618532b8ca686dab7e7d5e (diff) | |
| download | Qt-fcf91a2d527b393a366c997dd225c076afe34718.zip Qt-fcf91a2d527b393a366c997dd225c076afe34718.tar.gz Qt-fcf91a2d527b393a366c997dd225c076afe34718.tar.bz2 | |
Merge commit 'origin/4.6'
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/network/access/qnetworkrequest.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
Diffstat (limited to 'tools/assistant')
| -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; |