diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-09-03 10:48:01 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-06 03:01:11 (GMT) |
| commit | c31adf5be96455abcd27dbf075053ffaedafa65d (patch) | |
| tree | f3606ed7d0620f8fb84e55757fd31949a6c6cd27 /src/gui | |
| parent | a69084bf1d29f1c1a1c1fccd4d6ef008efbdd49e (diff) | |
| download | Qt-c31adf5be96455abcd27dbf075053ffaedafa65d.zip Qt-c31adf5be96455abcd27dbf075053ffaedafa65d.tar.gz Qt-c31adf5be96455abcd27dbf075053ffaedafa65d.tar.bz2 | |
Fix QStaticText copy constructor to also copy text option property
The text option property of QStaticText was not copied in the copy
constructor, so when the text was detached, the property would be
reset to the default.
Task-number: QTBUG-13368
Reviewed-by: Gunnar
(cherry picked from commit 200d1743dcdacf1036384f746046e55d91ccd918)
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qstatictext.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp index d986a48..48678c5 100644 --- a/src/gui/text/qstatictext.cpp +++ b/src/gui/text/qstatictext.cpp @@ -392,9 +392,9 @@ QStaticTextPrivate::QStaticTextPrivate() QStaticTextPrivate::QStaticTextPrivate(const QStaticTextPrivate &other) : text(other.text), font(other.font), textWidth(other.textWidth), matrix(other.matrix), - items(0), itemCount(0), glyphPool(0), positionPool(0), charPool(0), needsRelayout(true), - useBackendOptimizations(other.useBackendOptimizations), textFormat(other.textFormat), - untransformedCoordinates(other.untransformedCoordinates) + items(0), itemCount(0), glyphPool(0), positionPool(0), charPool(0), textOption(other.textOption), + needsRelayout(true), useBackendOptimizations(other.useBackendOptimizations), + textFormat(other.textFormat), untransformedCoordinates(other.untransformedCoordinates) { } |