diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-02 09:04:38 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-02 09:04:38 +0100 |
| commit | 71264bae08d81bdeceb96133fdb01c370504dfcc (patch) | |
| tree | d5dadaac8209d5ef1857a4d65197b9ee12b39848 /src/gui/painting | |
| parent | 5e785c0b83c9908c665f253c131629ac325a21f5 (diff) | |
| parent | 6d10f739cd750968d0dd0e9d8fa4b64353a86c6c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I84097f8e7b3b2128028bd7693c913d6968b82bfe
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qbrush.cpp | 4 | ||||
| -rw-r--r-- | src/gui/painting/qtransform.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp index 06a820a859..cc3ee76f0d 100644 --- a/src/gui/painting/qbrush.cpp +++ b/src/gui/painting/qbrush.cpp @@ -1006,7 +1006,7 @@ bool QBrush::operator==(const QBrush &b) const */ QDebug operator<<(QDebug dbg, const QBrush &b) { - static const char *const BRUSH_STYLES[] = { + static const char BRUSH_STYLES[][24] = { "NoBrush", "SolidPattern", "Dense1Pattern", @@ -1025,7 +1025,7 @@ QDebug operator<<(QDebug dbg, const QBrush &b) "LinearGradientPattern", "RadialGradientPattern", "ConicalGradientPattern", - 0, 0, 0, 0, 0, 0, + "", "", "", "", "", "", "TexturePattern" // 24 }; diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index 2d841b2953..673f64fbca 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -1118,16 +1118,16 @@ QDataStream & operator>>(QDataStream &s, QTransform &t) #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug dbg, const QTransform &m) { - static const char *const typeStr[] = + static const char typeStr[][12] = { "TxNone", "TxTranslate", "TxScale", - 0, + "", "TxRotate", - 0, 0, 0, + "", "", "", "TxShear", - 0, 0, 0, 0, 0, 0, 0, + "", "", "", "", "", "", "", "TxProject" }; |