diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-21 09:55:40 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-24 11:04:04 +0200 |
| commit | 1d01bc1e83560cb2fc4f9f7f00762ffa5134448a (patch) | |
| tree | 04bd3d0fa16ce4515360f9c65bec9cffa370749f /src/corelib/io/qdir.cpp | |
| parent | ccf27301e04addef0ed0cb6c7e832216cc3c12a8 (diff) | |
corelib: Remove Q_WS-macros.
Q_WS_QPA is the only active code path after merging
refactor, other Q_WS-macros are no longer used.
Enable compilation without -qpa.
- Remove Q_OS_MSDOS, Q_OS_OS2
- Remove Q_WS_QWS
- Remove/replace definitions/conditionals of Q_WS_XX
- Remove qpa branches from profiles
- Replace Q_WS_MAC by Q_OS_MAC
- Replace Q_WS_MAC && !Q_WS_QPA by
Q_OS_MAC && !QT_NO_CORESERVICES
- Similarly in profiles: mac:contains(QT_CONFIG, coreservices)
- Replace Q_FS_FAT by Q_OS_WIN
Change-Id: Icce5a6c55b052c8f72b3b979ddf31a4f388ea9c9
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src/corelib/io/qdir.cpp')
| -rw-r--r-- | src/corelib/io/qdir.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index 68da6283cf..e7fdc4ad55 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -794,7 +794,7 @@ QString QDir::convertSeparators(const QString &pathName) */ QString QDir::toNativeSeparators(const QString &pathName) { -#if defined(Q_FS_FAT) || defined(Q_OS_OS2EMX) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) int i = pathName.indexOf(QLatin1Char('/')); if (i != -1) { QString n(pathName); @@ -827,7 +827,7 @@ QString QDir::toNativeSeparators(const QString &pathName) */ QString QDir::fromNativeSeparators(const QString &pathName) { -#if defined(Q_FS_FAT) || defined(Q_OS_OS2EMX) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) int i = pathName.indexOf(QLatin1Char('\\')); if (i != -1) { QString n(pathName); @@ -1763,12 +1763,8 @@ QFileInfoList QDir::drives() */ QChar QDir::separator() { -#if defined (Q_FS_FAT) || defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) return QLatin1Char('\\'); -#elif defined(Q_OS_UNIX) - return QLatin1Char('/'); -#elif defined (Q_OS_MAC) - return QLatin1Char(':'); #else return QLatin1Char('/'); #endif |