diff options
author | Martin Jones <martin.jones@nokia.com> | 2011-05-04 17:53:51 +1000 |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2011-05-04 17:54:21 +1000 |
commit | 1b7c1b6ef86d3d56ff01b2eab118062a229b0d19 (patch) | |
tree | b85271416c0a6731b3a09bf6800c19bf574daeb1 /src/declarative/items/qsgtext_p_p.h | |
parent | ff62dede7b8f4d211ad1de922ccb901ab9ae055c (diff) |
Update SG items with GV item changes.
Diffstat (limited to 'src/declarative/items/qsgtext_p_p.h')
-rw-r--r-- | src/declarative/items/qsgtext_p_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/items/qsgtext_p_p.h b/src/declarative/items/qsgtext_p_p.h index 7df91f80d9..8d26394c3f 100644 --- a/src/declarative/items/qsgtext_p_p.h +++ b/src/declarative/items/qsgtext_p_p.h @@ -1,4 +1,4 @@ -// Commit: aeb330e3999ef3d7ae8d94b9330471f2a2a13554 +// Commit: 6e5a642c9484536fc173714f560f739944368cf5 /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). @@ -119,6 +119,7 @@ public: bool truncated:1; bool hAlignImplicit:1; bool rightToLeftText:1; + bool layoutTextElided:1; QRect layedOutTextRect; QSize paintedSize; |