diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:45:56 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 09:34:15 +0100 |
| commit | 5f4e02ca605f640beed9eebe74182814795e087e (patch) | |
| tree | 32c74e15e9bd2fcca52427314c73f35b900cabf7 /src/svg/qsvggraphics.cpp | |
| parent | dc9e39eb679946e82bf3b1a82f5c49737f9994b2 (diff) | |
| parent | c4c9b60dc4bbe3c3837c80ea63682f3ef9403277 (diff) | |
| download | qtsvg-5f4e02ca605f640beed9eebe74182814795e087e.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
Change-Id: I8b9a5a395dbd6659f7806eeebdd665c760a71ec1
Diffstat (limited to 'src/svg/qsvggraphics.cpp')
| -rw-r--r-- | src/svg/qsvggraphics.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/svg/qsvggraphics.cpp b/src/svg/qsvggraphics.cpp index 387136f..b1047eb 100644 --- a/src/svg/qsvggraphics.cpp +++ b/src/svg/qsvggraphics.cpp @@ -316,7 +316,6 @@ void QSvgText::draw(QPainter *p, QSvgExtraStates &states) bool appendSpace = false; QVector<QString> paragraphs; - QStack<QTextCharFormat> formats; QVector<QVector<QTextLayout::FormatRange> > formatRanges(1); paragraphs.push_back(QString()); |