diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-13 09:46:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-13 09:46:15 +0200 |
| commit | 4b72f48637a87c95deedcc501cd9cc8f717117fa (patch) | |
| tree | 80f00ade2cc3f3845e0f309f39a2649040d203e3 /src/quick/items/qquicktextinput_p.h | |
| parent | 3d30c6d7b40ce86f49bc7bdc5c2c74ce180bb3dd (diff) | |
| parent | f7e1f7b2f1f1577fd94dfffb93ef15ded5d09031 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/quick/util/qquickpixmapcache.cpp
tests/auto/quick/qquickwindow/BLACKLIST
Change-Id: Ie81612f2884f8ea508c48ba2735ec54ea1c2eca5
Diffstat (limited to 'src/quick/items/qquicktextinput_p.h')
| -rw-r--r-- | src/quick/items/qquicktextinput_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h index 1550e4eef7..333f55b35f 100644 --- a/src/quick/items/qquicktextinput_p.h +++ b/src/quick/items/qquicktextinput_p.h @@ -334,6 +334,7 @@ Q_SIGNALS: private: void invalidateFontCaches(); + void ensureActiveFocus(); protected: void geometryChanged(const QRectF &newGeometry, |