diff options
Diffstat (limited to 'src/corelib/io')
-rw-r--r-- | src/corelib/io/qdir.cpp | 2 | ||||
-rw-r--r-- | src/corelib/io/qfsfileengine_p.h | 4 | ||||
-rw-r--r-- | src/corelib/io/qprocess.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index 41278f1b91..9faa9f17b3 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -1730,7 +1730,7 @@ QFileInfoList QDir::drives() */ QChar QDir::separator() { -#if defined (Q_FS_FAT) || defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN) +#if defined (Q_FS_FAT) || defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) return QLatin1Char('\\'); #elif defined(Q_OS_UNIX) return QLatin1Char('/'); diff --git a/src/corelib/io/qfsfileengine_p.h b/src/corelib/io/qfsfileengine_p.h index 79dda1b70a..89c08aeca7 100644 --- a/src/corelib/io/qfsfileengine_p.h +++ b/src/corelib/io/qfsfileengine_p.h @@ -77,7 +77,7 @@ class Q_AUTOTEST_EXPORT QFSFileEnginePrivate : public QAbstractFileEnginePrivate Q_DECLARE_PUBLIC(QFSFileEngine) public: -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN static QString longFileName(const QString &path); #endif @@ -143,7 +143,7 @@ public: int getMapHandle(); #endif -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN HANDLE fileHandle; HANDLE mapHandle; QHash<uchar *, DWORD /* offset % AllocationGranularity */> maps; diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index af43ab7320..ddbbbd5286 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -93,7 +93,7 @@ QT_END_NAMESPACE #include <qsocketnotifier.h> #include <qtimer.h> -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN #include <private/qwineventnotifier_p.h> #endif @@ -764,10 +764,10 @@ QProcessPrivate::QProcessPrivate() dying = false; emittedReadyRead = false; emittedBytesWritten = false; -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN pipeWriter = 0; processFinishedNotifier = 0; -#endif // Q_WS_WIN +#endif // Q_OS_WIN #ifdef Q_OS_UNIX serial = 0; #endif |