summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-09-03 10:48:01 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-09-03 10:50:44 (GMT)
commit200d1743dcdacf1036384f746046e55d91ccd918 (patch)
treed05d3386e6c3a1e0b3db015e13ccc9d45566a472 /src
parentcff2b82a83b2746c42b9b8eb2a89f7345e468c05 (diff)
downloadQt-200d1743dcdacf1036384f746046e55d91ccd918.zip
Qt-200d1743dcdacf1036384f746046e55d91ccd918.tar.gz
Qt-200d1743dcdacf1036384f746046e55d91ccd918.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
Diffstat (limited to 'src')
-rw-r--r--src/gui/text/qstatictext.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp
index 21c2e02..b950b13 100644
--- a/src/gui/text/qstatictext.cpp
+++ b/src/gui/text/qstatictext.cpp
@@ -400,9 +400,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)
{
}