diff options
author | Bill King <bill.king@nokia.com> | 2009-11-18 22:32:16 (GMT) |
---|---|---|
committer | Bill King <bill.king@nokia.com> | 2009-11-18 22:32:16 (GMT) |
commit | 0186faea383f3f8223bffd1844e5a47ca22770a5 (patch) | |
tree | 8b17a7c752ada7c06d1d9b88575d5bd467dd3fbe /src/gui/painting/qbrush.cpp | |
parent | c7ef9c969fb368027135c5e7b0e9b6f53c465702 (diff) | |
parent | 80cd617b05ad3e647c87dc063d40cde0617344ca (diff) | |
download | Qt-0186faea383f3f8223bffd1844e5a47ca22770a5.zip Qt-0186faea383f3f8223bffd1844e5a47ca22770a5.tar.gz Qt-0186faea383f3f8223bffd1844e5a47ca22770a5.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/painting/qbrush.cpp')
-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", |