diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-17 09:31:22 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-17 09:33:15 +0100 |
commit | 251c020bbc5594f88b0dfab9b73afa28d8743754 (patch) | |
tree | fcd7352a955a5a6613903838bb53368168a17640 | |
parent | a0723d9bf7fca719db2249178e1e066d94e9c2c1 (diff) | |
download | qtquick1-251c020bbc5594f88b0dfab9b73afa28d8743754.tar.gz |
Prospective build fix after commit f8dbed12266c42785c1e4758eed05833ec035f33 in qtbase
Pass through the QVariant argument provided by the caller (QInputMethod).
Change-Id: Ia99546cd16287c14ce414d6aad0ea04488e7c6e2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextedit.cpp | 11 | ||||
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextedit_p.h | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp index cc4bae1b..bdcc66ba 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp @@ -1446,7 +1446,16 @@ Returns the value of the given \a property. QVariant QDeclarativeTextEdit::inputMethodQuery(Qt::InputMethodQuery property) const { Q_D(const QDeclarativeTextEdit); - return d->control->inputMethodQuery(property); + return d->control->inputMethodQuery(property, QVariant()); +} + +/*! +\internal +*/ +QVariant QDeclarativeTextEdit::inputMethodQuery(Qt::InputMethodQuery property, const QVariant &argument) const +{ + Q_D(const QDeclarativeTextEdit); + return d->control->inputMethodQuery(property, argument); } /*! diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p.h index a1d5a19b..4ce11e01 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextedit_p.h @@ -205,6 +205,7 @@ public: QRect cursorRectangle() const; QVariant inputMethodQuery(Qt::InputMethodQuery property) const; + Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery property, const QVariant &argument) const; qreal paintedWidth() const; qreal paintedHeight() const; |