diff options
| author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2012-10-18 15:22:15 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-22 19:36:43 +0200 |
| commit | 087e4bc5171f0ced1f34663e59217d678cd350ba (patch) | |
| tree | 0d122365bbc8bd4147196a1b379e0f7e57d3eb8e /src/widgets/styles/qfusionstyle.cpp | |
| parent | a0e5d6c1c05f1d9f811eaf2760193618ae8a83ca (diff) | |
Remove Cleanlooks and Plastique
We have a new style Fusion that will replace these styles.
They will be moved to a separate
module rather than included in platforms that do not need them.
Change-Id: I51ebbcad5406e99130e5b12e62ba624d1489088c
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/widgets/styles/qfusionstyle.cpp')
| -rw-r--r-- | src/widgets/styles/qfusionstyle.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index 3fc4cd0f1f..8e52a4b425 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -350,7 +350,7 @@ QFusionStylePrivate::QFusionStylePrivate() The Fusion style provides a custom look and feel that is not tied to a particular platform. //{Fusion Style Widget Gallery} - \sa QWindowsXPStyle, QMacStyle, QCommonStyle, QPlastiqueStyle + \sa QWindowsStyle, QWindowsVistaStyle, QMacStyle, QCommonStyle */ /*! @@ -3024,7 +3024,7 @@ QSize QFusionStyle::sizeFromContents(ContentsType type, const QStyleOption *opti newSize += QSize(2, 2); break; case CT_SpinBox: - newSize += QSize(0, -2); + newSize += QSize(0, -3); break; case CT_ComboBox: newSize += QSize(2, 4); @@ -3478,7 +3478,7 @@ int QFusionStyle::styleHint(StyleHint hint, const QStyleOption *option, const QW return 0; case SH_Table_GridLineColor: - return option->palette.background().color().darker(120).rgb(); + return option ? option->palette.background().color().darker(120).rgb() : 0; case SH_MessageBox_TextInteractionFlags: return Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse; |