diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-03 16:46:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-03 16:46:03 (GMT) |
| commit | 63e15bbb9666ab49305d45380f9f580fb0e168ca (patch) | |
| tree | 37568d1cfc42032bd66cfcff1e361ddaaab735ec /src/gui/text/qstatictext.cpp | |
| parent | a4a8e0b6726e4d0ba6c4eb90508929a5b4d870ec (diff) | |
| parent | 67bdfe3360c3319f2cda7197f34272dd5e3439c9 (diff) | |
| download | Qt-63e15bbb9666ab49305d45380f9f580fb0e168ca.zip Qt-63e15bbb9666ab49305d45380f9f580fb0e168ca.tar.gz Qt-63e15bbb9666ab49305d45380f9f580fb0e168ca.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed compilation of the modelview tutorial on Windows.
qdrawhelper: micro optimisation in fetchTransformBilinear
Fix QStaticText copy constructor to also copy text option property
qdrawhelper: Remove blend_transformed_bilinear_argb
Diffstat (limited to 'src/gui/text/qstatictext.cpp')
| -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 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) { } |