From fc14bd2c92d42aa055ce634e246820cef426ec9c Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 20 Oct 2011 16:36:05 +0200 Subject: 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 --- src/widgets/dialogs/qfiledialog.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/widgets/dialogs/qfiledialog.cpp') diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index c74d56dafc..22d334a1ec 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -58,7 +58,7 @@ #include #include #include -#if !defined(Q_WS_WINCE) && !defined(Q_OS_SYMBIAN) +#if !defined(Q_WS_WINCE) #include "ui_qfiledialog.h" #else #define Q_EMBEDDED_SMALLSCREEN @@ -3422,7 +3422,7 @@ QStringList QFSCompleter::splitPath(const QString &path) const parts[0] = sep[0]; #endif -#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WIN) bool startsFromRoot = !parts.isEmpty() && parts[0].endsWith(QLatin1Char(':')); #else bool startsFromRoot = pathCopy[0] == sep[0]; @@ -3434,7 +3434,7 @@ QStringList QFSCompleter::splitPath(const QString &path) const else dirModel = sourceModel; QString currentLocation = QDir::toNativeSeparators(dirModel->rootPath()); -#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WIN) if (currentLocation.endsWith(QLatin1Char(':'))) currentLocation.append(sep); #endif -- cgit v1.2.3