diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-12-23 13:41:58 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-12-23 13:41:58 (GMT) |
| commit | 4376f8871b4422830e9ffb7f3acbc29766d8d218 (patch) | |
| tree | 4f1df650ecbb1f5a66c49ab9e4458d75ebeef095 /src/corelib/global/qglobal.h | |
| parent | c5e5998bec4aafca555543d1ef3c335f7b280294 (diff) | |
| download | Qt-4376f8871b4422830e9ffb7f3acbc29766d8d218.zip Qt-4376f8871b4422830e9ffb7f3acbc29766d8d218.tar.gz Qt-4376f8871b4422830e9ffb7f3acbc29766d8d218.tar.bz2 | |
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.
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 3 |
1 files changed, 3 insertions, 0 deletions
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 |