diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-11 18:19:29 +0100 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-11 18:19:29 +0100 |
| commit | 8c13e18eb49ab9ab42db4359f0ccc91de5c72818 (patch) | |
| tree | 17dbc029e37835594ad29d586f3fc7ec8013b65a /src/gui/painting/qbrush.cpp | |
| parent | de76200652e05de34d99f111c64a051a49911034 (diff) | |
| parent | 2d63f8fe5b77747014e1c5807c9d457611bd9304 (diff) | |
| download | qt4-tools-8c13e18eb49ab9ab42db4359f0ccc91de5c72818.tar.gz | |
Merge commit 'widget/4.6' into oslo-staging-2/4.6
Conflicts:
src/gui/painting/qbrush.cpp
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 afe9986870..7273c35cee 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", |