diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-13 09:56:33 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-13 09:56:33 (GMT) |
| commit | c66dfc7bf1ae04bdcee9675db95a4787ba4ede69 (patch) | |
| tree | d4b24286d03e396bdf89bd8d14f021b02b6bbfdb /src/gui/painting | |
| parent | 226ce3651265bf68a8058d59277d63fb0df43076 (diff) | |
| parent | edede3b20aa6ffdb16c790f7e537f5b8e9c96e68 (diff) | |
| download | Qt-c66dfc7bf1ae04bdcee9675db95a4787ba4ede69.zip Qt-c66dfc7bf1ae04bdcee9675db95a4787ba4ede69.tar.gz Qt-c66dfc7bf1ae04bdcee9675db95a4787ba4ede69.tar.bz2 | |
Merge commit 'upstream/4.6' into 4.6
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", |