diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-09 12:23:53 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-09 12:23:53 (GMT) |
| commit | 850c3f7d9bb5fbad041dd935d1d53c5d49db0163 (patch) | |
| tree | 3ebb00088919d21c51c34b3c002c41b3fd1bedbe /src/gui/painting | |
| parent | 19a566f82a7c684423331a8caab70ec594afd1ce (diff) | |
| parent | 64a360f45ab9a1c50ca628cfd6b670b93816c756 (diff) | |
| download | Qt-850c3f7d9bb5fbad041dd935d1d53c5d49db0163.zip Qt-850c3f7d9bb5fbad041dd935d1d53c5d49db0163.tar.gz Qt-850c3f7d9bb5fbad041dd935d1d53c5d49db0163.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
src/multimedia/audio/qaudioinput_win32_p.h
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qbrush.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp index a82d0f9..182cce9 100644 --- a/src/gui/painting/qbrush.cpp +++ b/src/gui/painting/qbrush.cpp @@ -989,7 +989,8 @@ QDebug operator<<(QDebug dbg, const QBrush &b) "LinearGradientPattern", "RadialGradientPattern", "ConicalGradientPattern", - "TexturePattern" + 0, 0, 0, 0, 0, 0, + "TexturePattern" // 24 }; dbg.nospace() << "QBrush(" << b.color() << ',' << BRUSH_STYLES[b.style()] << ')'; |