diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-04-30 10:44:29 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-05-02 08:40:48 +0200 |
| commit | c3e1e6390edbc28e6e528f401eb4f3639661302b (patch) | |
| tree | 5c882bfe7fced9b357e80a6b56ccdc88de8a41c3 /src/quick/items/qquicktext.cpp | |
| parent | 9709d04ba7787c853a1ddbeed0347eab27c0924f (diff) | |
| parent | 6a2febc680e163e56eb61d322d156dbf6fb07e0e (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I71275a2076c3d32ee2896571be882067320a2e9e
Diffstat (limited to 'src/quick/items/qquicktext.cpp')
| -rw-r--r-- | src/quick/items/qquicktext.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 19b99fbea2..09371db66d 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -3056,3 +3056,5 @@ QJSValue QQuickText::fontInfo() const } QT_END_NAMESPACE + +#include "moc_qquicktext_p.cpp" |