summaryrefslogtreecommitdiffstats
path: root/src/gui/util
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-10-13 14:25:18 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-13 15:07:41 +0200
commit1582407fc782c0befd0760633324dd5c206524a1 (patch)
treee993d66e824da41ece006d44c48acd4df0ba749e /src/gui/util
parent30cb91e17d2fbbdce90f7542f44e12af971ba2de (diff)
Remove Q_WS_ and Q_OS_SYMBIAN from QtGui.
Change-Id: I2ac3376513c3fbfc81a2e695a73a0d948d2696bc Reviewed-on: http://codereview.qt-project.org/6607 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/gui/util')
-rw-r--r--src/gui/util/qdesktopservices.cpp10
-rw-r--r--src/gui/util/qdesktopservices_s60.cpp5
-rw-r--r--src/gui/util/qdesktopservices_win.cpp4
3 files changed, 0 insertions, 19 deletions
diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp
index 669f7ea893..7e8195afe9 100644
--- a/src/gui/util/qdesktopservices.cpp
+++ b/src/gui/util/qdesktopservices.cpp
@@ -45,17 +45,7 @@
#include <qdebug.h>
-#if defined(Q_WS_QWS) || defined(Q_WS_QPA)
#include "qdesktopservices_qpa.cpp"
-#elif defined(Q_WS_X11)
-#include "qdesktopservices_x11.cpp"
-#elif defined(Q_WS_WIN)
-#include "qdesktopservices_win.cpp"
-#elif defined(Q_WS_MAC)
-#include "qdesktopservices_mac.cpp"
-#elif defined(Q_OS_SYMBIAN)
-#include "qdesktopservices_s60.cpp"
-#endif
#include <qhash.h>
#include <qobject.h>
diff --git a/src/gui/util/qdesktopservices_s60.cpp b/src/gui/util/qdesktopservices_s60.cpp
index 97d1226032..41fc0f3b3c 100644
--- a/src/gui/util/qdesktopservices_s60.cpp
+++ b/src/gui/util/qdesktopservices_s60.cpp
@@ -49,11 +49,6 @@
#include <pathinfo.h> // PathInfo
#ifndef USE_SCHEMEHANDLER
-#ifdef Q_WS_S60
-// This flag changes the implementation to use S60 CDcoumentHandler
-// instead of apparc when opening the files
-#define USE_DOCUMENTHANDLER
-#endif
#include <txtrich.h> // CRichText
#include <eikenv.h> // CEikonEnv
diff --git a/src/gui/util/qdesktopservices_win.cpp b/src/gui/util/qdesktopservices_win.cpp
index 6f447aae4b..b06b52e399 100644
--- a/src/gui/util/qdesktopservices_win.cpp
+++ b/src/gui/util/qdesktopservices_win.cpp
@@ -191,11 +191,7 @@ QString QDesktopServices::storageLocation(StandardLocation type)
switch (type) {
case DataLocation:
-#if defined Q_WS_WINCE
- if (SHGetSpecialFolderPath(0, path, CSIDL_APPDATA, FALSE))
-#else
if (SHGetSpecialFolderPath(0, path, CSIDL_LOCAL_APPDATA, FALSE))
-#endif
result = QString::fromWCharArray(path);
if (!QCoreApplication::organizationName().isEmpty())
result = result + QLatin1String("\\") + QCoreApplication::organizationName();