diff options
author | Olli Werwolff <qt-info@nokia.com> | 2011-05-24 09:14:43 +0200 |
---|---|---|
committer | Olli Werwolff <qt-info@nokia.com> | 2011-05-24 09:20:50 +0200 |
commit | f86334a0155ad38138a012c7f9e54c25206abebd (patch) | |
tree | 117a838973bfd315f0e946b9064dda1b5d9b533f /src/corelib/kernel/qcoreapplication.cpp | |
parent | 6a3dce19957535d9b9b7311a487469ed7566ac25 (diff) |
Make QtCore compile with on Windows when -qpa is used
Core functionality almost never is window system dependent.
Reviewed-by: Friedemann Kleint
Diffstat (limited to 'src/corelib/kernel/qcoreapplication.cpp')
-rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index c323d44de7..16f5e33bc0 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -171,7 +171,7 @@ CApaCommandLine* QCoreApplicationPrivate::symbianCommandLine() #endif -#if defined(Q_WS_WIN) || defined(Q_WS_MAC) +#if defined(Q_OS_WIN) || defined(Q_WS_MAC) extern QString qAppFileName(); #endif @@ -1285,7 +1285,7 @@ void QCoreApplication::postEvent(QObject *receiver, QEvent *event, int priority) */ bool QCoreApplication::compressEvent(QEvent *event, QObject *receiver, QPostEventList *postedEvents) { -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN Q_ASSERT(event); Q_ASSERT(receiver); Q_ASSERT(postedEvents); @@ -1991,7 +1991,7 @@ QString QCoreApplication::applicationFilePath() if (!d->cachedApplicationFilePath.isNull()) return d->cachedApplicationFilePath; -#if defined(Q_WS_WIN) +#if defined(Q_OS_WIN) d->cachedApplicationFilePath = QFileInfo(qAppFileName()).filePath(); return d->cachedApplicationFilePath; #elif defined(Q_WS_MAC) |