summaryrefslogtreecommitdiffstats
path: root/src/gui/styles
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-02 16:06:13 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-02 16:06:13 (GMT)
commitc5ac774717f1ec2c99407e3ee3c337127d94329e (patch)
treed316abfff7585c3ff9b8c08ecf9ef8b6bd0d73b0 /src/gui/styles
parent187185bf246b63f080cf2a59b6768756b399e72c (diff)
parent8e2b95b1115bc07f81d0fa22cc2929bb28d3e9bb (diff)
downloadQt-c5ac774717f1ec2c99407e3ee3c337127d94329e.zip
Qt-c5ac774717f1ec2c99407e3ee3c337127d94329e.tar.gz
Qt-c5ac774717f1ec2c99407e3ee3c337127d94329e.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/gui/styles')
-rw-r--r--src/gui/styles/qstyle.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp
index 0a75492..3ebfab2 100644
--- a/src/gui/styles/qstyle.cpp
+++ b/src/gui/styles/qstyle.cpp
@@ -367,10 +367,10 @@ QStyle::~QStyle()
Note that the default implementation does nothing. Reasonable
actions in this function might be to call the
QWidget::setBackgroundMode() function for the widget. Do not use
- the function to set, for example, the geometry; reimplementing
- this function do provide a back-door through which the appearance
- of a widget can be changed, but with Qt 4.0's style engine there
- is rarely necessary to implement this function; reimplement the
+ the function to set, for example, the geometry. Reimplementing
+ this function provides a back-door through which the appearance
+ of a widget can be changed, but with Qt's style engine it is
+ rarely necessary to implement this function; reimplement
drawItemPixmap(), drawItemText(), drawPrimitive(), etc. instead.
The QWidget::inherits() function may provide enough information to