summaryrefslogtreecommitdiffstats
path: root/src/gui/painting
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-11-09 12:20:37 (GMT)
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-11-09 12:20:37 (GMT)
commit09d00073e50957ca183e40f0d22aeef9c82edb49 (patch)
treefb53d8e800ae1d5e2740ec35b47ebea86eb2a008 /src/gui/painting
parent9fbcda80c8857202db01f58a9568e16604518b88 (diff)
parentd6a23684c8546fcd20ac032aa01985ca7ac69128 (diff)
downloadQt-09d00073e50957ca183e40f0d22aeef9c82edb49.zip
Qt-09d00073e50957ca183e40f0d22aeef9c82edb49.tar.gz
Qt-09d00073e50957ca183e40f0d22aeef9c82edb49.tar.bz2
Merge branch '4.6-platform' into 4.6
Diffstat (limited to 'src/gui/painting')
-rw-r--r--src/gui/painting/qbrush.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index 6f5d892..afe9986 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
- char *BRUSH_STYLES[] = {
+ const char *BRUSH_STYLES[] = {
"NoBrush",
"SolidPattern",
"Dense1Pattern",