summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel/qguiplatformplugin.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-10-20 16:36:05 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-21 21:29:46 +0200
commitfc14bd2c92d42aa055ce634e246820cef426ec9c (patch)
tree1403dd2d11621d36a4d2a7ec2e986a5b85bcbf2d /src/widgets/kernel/qguiplatformplugin.cpp
parentc7df1af337e0d5a013a2f1c17bb14df083769410 (diff)
Widgets: Remove Q_WS_QPA and qpa-sections from .pro files.
Enable compilation without -qpa. - Remove conditionals from Q_WS_QPA sections. - Rename precompiled header. - Remove gui-related Q_OS_SYMBIAN-#ifdef sections. - Leave other Q_WS code in for reference. Change-Id: I16326b631fff483aec8edd2f7a2e7a1822eab814 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/widgets/kernel/qguiplatformplugin.cpp')
-rw-r--r--src/widgets/kernel/qguiplatformplugin.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/widgets/kernel/qguiplatformplugin.cpp b/src/widgets/kernel/qguiplatformplugin.cpp
index 09a364c150..8acc7ec90d 100644
--- a/src/widgets/kernel/qguiplatformplugin.cpp
+++ b/src/widgets/kernel/qguiplatformplugin.cpp
@@ -146,14 +146,8 @@ QString QGuiPlatformPlugin::styleName()
return QLatin1String("Windows"); // default styles for Windows
#elif defined(Q_WS_X11) && defined(Q_OS_SOLARIS)
return QLatin1String("CDE"); // default style for X11 on Solaris
-#elif defined(Q_WS_S60)
- return QLatin1String("S60"); // default style for Symbian with S60
-#elif defined(Q_OS_SYMBIAN)
- return QLatin1String("Windows"); // default style for Symbian without S60
#elif defined(Q_WS_X11) && defined(Q_OS_IRIX)
return QLatin1String("SGI"); // default style for X11 on IRIX
-#elif defined(Q_WS_QWS) || defined(Q_WS_QPA)
- return QLatin1String("Plastique"); // default style for X11 and small devices
#elif defined(Q_WS_MAC)
return QLatin1String("Macintosh"); // default style for all Mac's
#elif defined(Q_WS_X11)
@@ -184,6 +178,8 @@ QString QGuiPlatformPlugin::styleName()
break;
}
return stylename;
+#else
+ return QLatin1String("Plastique"); // default style for X11 and small devices
#endif
}