diff options
| author | axis <qt-info@nokia.com> | 2009-11-12 16:07:11 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-12 16:07:11 (GMT) |
| commit | 97c76cf8a3320d6e99126965287697f8a14de4d7 (patch) | |
| tree | 5f07c9d2bc99c2bd43fe462458d8423fb14715be /src/gui/painting | |
| parent | 771672fa1a94a9b2b19e378d1b362dcdae323887 (diff) | |
| parent | 8e589bc0aa6df55052e37b3107f2f03a1dc17d06 (diff) | |
| download | Qt-97c76cf8a3320d6e99126965287697f8a14de4d7.zip Qt-97c76cf8a3320d6e99126965287697f8a14de4d7.tar.gz Qt-97c76cf8a3320d6e99126965287697f8a14de4d7.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-s60
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qbrush.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp index afe9986..7273c35 100644 --- a/src/gui/painting/qbrush.cpp +++ b/src/gui/painting/qbrush.cpp @@ -970,7 +970,7 @@ bool QBrush::operator==(const QBrush &b) const QDebug operator<<(QDebug dbg, const QBrush &b) { #ifndef Q_BROKEN_DEBUG_STREAM - const char *BRUSH_STYLES[] = { + static const char *BRUSH_STYLES[] = { "NoBrush", "SolidPattern", "Dense1Pattern", |