diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2010-08-09 11:57:14 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2010-08-09 11:57:14 (GMT) |
| commit | 662f87ad52ea75229ce18b19983890425cc45298 (patch) | |
| tree | 67b1764083e54f017e0d318c63c152af40307ad9 /src/gui | |
| parent | eea84818e98af917d3cf2bf04ea17a416ef9d55e (diff) | |
| parent | 7829343dc9e12befd6c471cc72d00139bad5d42b (diff) | |
| download | Qt-662f87ad52ea75229ce18b19983890425cc45298.zip Qt-662f87ad52ea75229ce18b19983890425cc45298.tar.gz Qt-662f87ad52ea75229ce18b19983890425cc45298.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/styles/qstyle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp index 687e587..0a75492 100644 --- a/src/gui/styles/qstyle.cpp +++ b/src/gui/styles/qstyle.cpp @@ -325,7 +325,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C control over size of header items and row and column sizes. \sa QStyleOption, QStylePainter, {Styles Example}, - {Styles & Style Aware Widgets}, QStyledItemDelegate + {Styles and Style Aware Widgets}, QStyledItemDelegate */ /*! |