diff options
| author | J-P Nurmi <j-p.nurmi@nokia.com> | 2012-08-27 13:40:30 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-31 18:56:35 +0200 |
| commit | 50e3da79bf15374cc6e2b7a108004a1b7b1c4126 (patch) | |
| tree | 87dac6178330c20a0cdde3b968d0b9b2867c1276 /src/widgets/styles/qwindowsstyle.cpp | |
| parent | dd299a568b2cf5ee335fcb01020da9032a57f01e (diff) | |
QXxxStyle: override standardIcon() & layoutSpacing()
QStyle::standardIconImplementation() & layoutSpacingImplementation()
are removed, and standardIcon() & layoutSpacing() made pure virtual.
Change-Id: Ibf43323d0cf6c3b6cec4547afe8e826e120f74ba
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
Diffstat (limited to 'src/widgets/styles/qwindowsstyle.cpp')
| -rw-r--r-- | src/widgets/styles/qwindowsstyle.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp index 51f93fb292..648d60848a 100644 --- a/src/widgets/styles/qwindowsstyle.cpp +++ b/src/widgets/styles/qwindowsstyle.cpp @@ -3079,10 +3079,10 @@ QSize QWindowsStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt, } /*! - \internal + \reimp */ -QIcon QWindowsStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option, - const QWidget *widget) const +QIcon QWindowsStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *option, + const QWidget *widget) const { QIcon icon; QPixmap pixmap; @@ -3209,7 +3209,7 @@ QIcon QWindowsStyle::standardIconImplementation(StandardPixmap standardIcon, con #endif if (icon.isNull()) - icon = QCommonStyle::standardIconImplementation(standardIcon, option, widget); + icon = QCommonStyle::standardIcon(standardIcon, option, widget); return icon; } |