diff options
| author | Xizhi Zhu <xizhi.zhu@gmail.com> | 2012-01-23 19:37:27 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-31 07:05:00 +0100 |
| commit | e8105e4783f3932885695353eefa1a60937929a1 (patch) | |
| tree | 7b2217f4c92a7fb330212d3fd960cb377d77c3db /src/widgets/styles | |
| parent | 0436281771d5d47f0c80d0694f938bb8f737da4c (diff) | |
Remove Symbian and Maemo 5 code from QtWidgets.
Change-Id: I715c0ec70cbad05a6ba9737e49be9da7cbd65bf9
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets/styles')
| -rw-r--r-- | src/widgets/styles/qstylefactory.cpp | 12 | ||||
| -rw-r--r-- | src/widgets/styles/qstylesheetstyle_default.cpp | 3 |
2 files changed, 1 insertions, 14 deletions
diff --git a/src/widgets/styles/qstylefactory.cpp b/src/widgets/styles/qstylefactory.cpp index bd8b73b621..ef555fbdb1 100644 --- a/src/widgets/styles/qstylefactory.cpp +++ b/src/widgets/styles/qstylefactory.cpp @@ -69,9 +69,6 @@ #ifndef QT_NO_STYLE_WINDOWSMOBILE #include "qwindowsmobilestyle.h" #endif -#ifndef QT_NO_STYLE_S60 -#include "qs60style.h" -#endif QT_BEGIN_NAMESPACE @@ -158,11 +155,6 @@ QStyle *QStyleFactory::create(const QString& key) ret = new QCDEStyle; else #endif -#ifndef QT_NO_STYLE_S60 - if (style == QLatin1String("s60")) - ret = new QS60Style; - else -#endif #ifndef QT_NO_STYLE_PLASTIQUE if (style == QLatin1String("plastique")) ret = new QPlastiqueStyle; @@ -242,10 +234,6 @@ QStringList QStyleFactory::keys() if (!list.contains(QLatin1String("CDE"))) list << QLatin1String("CDE"); #endif -#ifndef QT_NO_STYLE_S60 - if (!list.contains(QLatin1String("S60"))) - list << QLatin1String("S60"); -#endif #ifndef QT_NO_STYLE_PLASTIQUE if (!list.contains(QLatin1String("Plastique"))) list << QLatin1String("Plastique"); diff --git a/src/widgets/styles/qstylesheetstyle_default.cpp b/src/widgets/styles/qstylesheetstyle_default.cpp index f71ab3ea8c..f22a6d16b5 100644 --- a/src/widgets/styles/qstylesheetstyle_default.cpp +++ b/src/widgets/styles/qstylesheetstyle_default.cpp @@ -158,8 +158,7 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const // pixmap based style doesn't support any features bool styleIsPixmapBased = baseStyle()->inherits("QMacStyle") || baseStyle()->inherits("QWindowsXPStyle") - || baseStyle()->inherits("QGtkStyle") - || baseStyle()->inherits("QS60Style"); + || baseStyle()->inherits("QGtkStyle"); /*QLineEdit { |