diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-03-03 15:40:24 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-03-03 15:40:43 +0100 |
| commit | 1511dc39a62e9d14b6755d6c2335547c85331d49 (patch) | |
| tree | 0b60c51b7597b2fe4ea16a432f4c615214efa0a7 /src/quick/items/qquicktextinput_p_p.h | |
| parent | 75b191b31d9936b134ca9776f1e69e891d03be11 (diff) | |
| parent | 915dcb6f8cb6207566f4838f641f434508336fa7 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
This merge also removes the pin for qtbase.
Change-Id: If86998fb912d100cfad150d255ed41544ba1fb0c
Diffstat (limited to 'src/quick/items/qquicktextinput_p_p.h')
| -rw-r--r-- | src/quick/items/qquicktextinput_p_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/items/qquicktextinput_p_p.h b/src/quick/items/qquicktextinput_p_p.h index 240fc7a599..21bd1bd6d7 100644 --- a/src/quick/items/qquicktextinput_p_p.h +++ b/src/quick/items/qquicktextinput_p_p.h @@ -423,6 +423,7 @@ public: void setCursorBlinkPeriod(int msec); void updateLayout(); + void updateBaselineOffset(); qreal getImplicitWidth() const; |