summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qcoreapplication.h
diff options
context:
space:
mode:
authorOlli Werwolff <qt-info@nokia.com>2011-05-24 09:14:43 +0200
committerOlli Werwolff <qt-info@nokia.com>2011-05-24 09:20:50 +0200
commitf86334a0155ad38138a012c7f9e54c25206abebd (patch)
tree117a838973bfd315f0e946b9064dda1b5d9b533f /src/corelib/kernel/qcoreapplication.h
parent6a3dce19957535d9b9b7311a487469ed7566ac25 (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.h')
-rw-r--r--src/corelib/kernel/qcoreapplication.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h
index 929e4a9836..8bb087bf0c 100644
--- a/src/corelib/kernel/qcoreapplication.h
+++ b/src/corelib/kernel/qcoreapplication.h
@@ -50,7 +50,7 @@
#include <QtCore/qstringlist.h>
#endif
-#if defined(Q_WS_WIN) && !defined(tagMSG)
+#if defined(Q_OS_WIN) && !defined(tagMSG)
typedef struct tagMSG MSG;
#endif
@@ -168,7 +168,7 @@ public:
static QT3_SUPPORT int loopLevel();
#endif
-#if defined(Q_WS_WIN)
+#if defined(Q_OS_WIN)
virtual bool winEventFilter(MSG *message, long *result);
#endif
@@ -280,7 +280,7 @@ Q_CORE_EXPORT void qAddPostRoutine(QtCleanUpFunction);
Q_CORE_EXPORT void qRemovePostRoutine(QtCleanUpFunction);
Q_CORE_EXPORT QString qAppName(); // get application name
-#if defined(Q_WS_WIN) && !defined(QT_NO_DEBUG_STREAM)
+#if defined(Q_OS_WIN) && !defined(QT_NO_DEBUG_STREAM)
Q_CORE_EXPORT QString decodeMSG(const MSG &);
Q_CORE_EXPORT QDebug operator<<(QDebug, const MSG &);
#endif