diff options
Diffstat (limited to 'src/widgets/styles/qstylefactory.cpp')
-rw-r--r-- | src/widgets/styles/qstylefactory.cpp | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/src/widgets/styles/qstylefactory.cpp b/src/widgets/styles/qstylefactory.cpp index bebd322c9e..09cccff4e8 100644 --- a/src/widgets/styles/qstylefactory.cpp +++ b/src/widgets/styles/qstylefactory.cpp @@ -56,12 +56,6 @@ #ifndef QT_NO_STYLE_WINDOWSVISTA #include "qwindowsvistastyle_p.h" #endif -#ifndef QT_NO_STYLE_WINDOWSCE -#include "qwindowscestyle_p.h" -#endif -#ifndef QT_NO_STYLE_WINDOWSMOBILE -#include "qwindowsmobilestyle_p.h" -#endif #if !defined(QT_NO_STYLE_MAC) && defined(Q_OS_MAC) # include "qmacstyle_mac_p.h" @@ -114,16 +108,6 @@ QStyle *QStyleFactory::create(const QString& key) ret = new QWindowsStyle; else #endif -#ifndef QT_NO_STYLE_WINDOWSCE - if (style == QLatin1String("windowsce")) - ret = new QWindowsCEStyle; - else -#endif -#ifndef QT_NO_STYLE_WINDOWSMOBILE - if (style == QLatin1String("windowsmobile")) - ret = new QWindowsMobileStyle; - else -#endif #ifndef QT_NO_STYLE_WINDOWSXP if (style == QLatin1String("windowsxp")) ret = new QWindowsXPStyle; @@ -147,7 +131,7 @@ QStyle *QStyleFactory::create(const QString& key) #ifndef QT_NO_STYLE_MAC if (style.startsWith(QLatin1String("macintosh"))) { ret = new QMacStyle; -# ifdef Q_DEAD_CODE_FROM_QT4_MAC +# if 0 // Used to be included in Qt4 for Q_WS_MAC if (style == QLatin1String("macintosh")) style += QLatin1String(" (aqua)"); # endif @@ -180,14 +164,6 @@ QStringList QStyleFactory::keys() if (!list.contains(QLatin1String("Windows"))) list << QLatin1String("Windows"); #endif -#ifndef QT_NO_STYLE_WINDOWSCE - if (!list.contains(QLatin1String("WindowsCE"))) - list << QLatin1String("WindowsCE"); -#endif -#ifndef QT_NO_STYLE_WINDOWSMOBILE - if (!list.contains(QLatin1String("WindowsMobile"))) - list << QLatin1String("WindowsMobile"); -#endif #ifndef QT_NO_STYLE_WINDOWSXP if (!list.contains(QLatin1String("WindowsXP")) && (QSysInfo::WindowsVersion >= QSysInfo::WV_XP && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based))) @@ -208,7 +184,7 @@ QStringList QStyleFactory::keys() #endif #ifndef QT_NO_STYLE_MAC QString mstyle = QLatin1String("Macintosh"); -# ifdef Q_DEAD_CODE_FROM_QT4_MAC +# if 0 // Used to be included in Qt4 for Q_WS_MAC mstyle += QLatin1String(" (aqua)"); # endif if (!list.contains(mstyle)) |