OSDN Git Service

remove leftovers from WindowsMobile style
authorIvailo Monev <xakepa10@gmail.com>
Sat, 16 Apr 2016 19:34:27 +0000 (19:34 +0000)
committerIvailo Monev <xakepa10@gmail.com>
Sat, 16 Apr 2016 19:34:27 +0000 (19:34 +0000)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/core/global/qconfig.h.cmake
src/gui/styles/qstylefactory.cpp
src/gui/styles/styles.cmake

index 06c89b6..c9f9cdd 100644 (file)
@@ -48,6 +48,7 @@
 #define QT_NO_PHONON
 #define QT_NO_WIN_ACTIVEQT
 #define QT_NO_QWS_QPF2
+#define QT_NO_STYLE_WINDOWSMOBILE
 
 /* Qt build specs */
 #ifndef QT_EDITION
 #cmakedefine QT_NO_TREEWIDGET
 #cmakedefine QT_NO_VALIDATOR
 
-#endif
\ No newline at end of file
+#endif
index cdf174c..7272de0 100644 (file)
@@ -66,9 +66,6 @@
 #ifndef QT_NO_STYLE_WINDOWSCE
 #include "qwindowscestyle.h"
 #endif
-#ifndef QT_NO_STYLE_WINDOWSMOBILE
-#include "qwindowsmobilestyle.h"
-#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -129,11 +126,6 @@ QStyle *QStyleFactory::create(const QString& key)
         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;
@@ -211,10 +203,6 @@ QStringList QStyleFactory::keys()
     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)))
index e261b7a..13ba112 100644 (file)
@@ -147,7 +147,3 @@ if(KATIE_PLATFORM STREQUAL "win32" OR KATIE_WINDOWS_STYLE)
 else()
     add_definitions(-DQT_NO_STYLE_WINDOWS)
 endif()
-
-
-# not supported
-add_definitions(-DQT_NO_STYLE_WINDOWSMOBILE)