From 4376f8871b4422830e9ffb7f3acbc29766d8d218 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 23 Dec 2009 14:41:58 +0100 Subject: Revert "remove obsolete QT_WA/QT_WA_INLINE macros" To be on the safe side wrt source compatibilty, we'll postpone the QT_WA / QT_WA_INLINE removal for Qt 5. This reverts commit c5e5998bec4aafca555543d1ef3c335f7b280294. --- src/corelib/global/qglobal.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 5851d26..1f0b80c 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1540,6 +1540,9 @@ inline QT3_SUPPORT bool qt_winUnicode() { return true; } inline QT3_SUPPORT int qWinVersion() { return QSysInfo::WindowsVersion; } #endif +#define QT_WA(unicode, ansi) unicode +#define QT_WA_INLINE(unicode, ansi) (unicode) + #endif /* Q_WS_WIN */ #ifndef Q_OUTOFLINE_TEMPLATE -- cgit v0.12