diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-07-28 09:37:43 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-07-28 09:37:43 (GMT) |
| commit | 50fac2f996c04c6da194564eed66ab9ee1bd46ce (patch) | |
| tree | 7707aa318135cb737d50badb7ae48f83b1b462f4 /src/gui/util/qcompleter.h | |
| parent | 06af27069497a693f5b1a867b29d96297f68eb75 (diff) | |
| parent | e498880396d44c90e46308e2fa5903b51f9f4132 (diff) | |
| download | Qt-50fac2f996c04c6da194564eed66ab9ee1bd46ce.zip Qt-50fac2f996c04c6da194564eed66ab9ee1bd46ce.tar.gz Qt-50fac2f996c04c6da194564eed66ab9ee1bd46ce.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into qtwebkit-4.6-staging
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
util/webkit/mkdist-webkit
Diffstat (limited to 'src/gui/util/qcompleter.h')
| -rw-r--r-- | src/gui/util/qcompleter.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/util/qcompleter.h b/src/gui/util/qcompleter.h index c1169ef..a419154 100644 --- a/src/gui/util/qcompleter.h +++ b/src/gui/util/qcompleter.h @@ -69,6 +69,7 @@ class Q_GUI_EXPORT QCompleter : public QObject Q_PROPERTY(CompletionMode completionMode READ completionMode WRITE setCompletionMode) Q_PROPERTY(int completionColumn READ completionColumn WRITE setCompletionColumn) Q_PROPERTY(int completionRole READ completionRole WRITE setCompletionRole) + Q_PROPERTY(int maxVisibleItems READ maxVisibleItems WRITE setMaxVisibleItems) Q_PROPERTY(Qt::CaseSensitivity caseSensitivity READ caseSensitivity WRITE setCaseSensitivity) Q_PROPERTY(bool wrapAround READ wrapAround WRITE setWrapAround) @@ -118,6 +119,9 @@ public: bool wrapAround() const; + int maxVisibleItems() const; + void setMaxVisibleItems(int maxItems); + int completionCount() const; bool setCurrentRow(int row); int currentRow() const; |