diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-01-23 12:36:29 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-01-23 12:36:29 +0100 |
| commit | 03fe99ba3a7d29b1606660baa407cff21c4d4d35 (patch) | |
| tree | 525d5f03e8703bf7e9a7851280de67a597dceea1 /src/quick/items/qquicktext_p.h | |
| parent | f02e234fc012f4430378bc5205f32914822e4dff (diff) | |
| parent | 94e6106d357ca5a1349a2b10a69dd84db34065c8 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: I762e578aaf14a77efa26ce3fda2abb0e335003ea
Diffstat (limited to 'src/quick/items/qquicktext_p.h')
| -rw-r--r-- | src/quick/items/qquicktext_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h index 40dbd51f39..c3d3906e7e 100644 --- a/src/quick/items/qquicktext_p.h +++ b/src/quick/items/qquicktext_p.h @@ -218,7 +218,8 @@ public: QRectF boundingRect() const Q_DECL_OVERRIDE; QRectF clipRect() const Q_DECL_OVERRIDE; - Q_INVOKABLE void doLayout(); + Q_INVOKABLE void doLayout(); // ### Qt 6: remove + Q_REVISION(9) Q_INVOKABLE void forceLayout(); RenderType renderType() const; void setRenderType(RenderType renderType); |