diff options
| author | Marius Storm-Olsen <marius@trolltech.com> | 2009-07-01 09:50:36 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius@trolltech.com> | 2009-07-01 09:51:27 (GMT) |
| commit | a6e32ae1c84984041107a83db9307caffbda9849 (patch) | |
| tree | c27e61daf15cf5ba2b4b61971c27916a27d49852 | |
| parent | a69160c5f4ef146f5e9922161bcff9c6fed213c7 (diff) | |
| download | Qt-a6e32ae1c84984041107a83db9307caffbda9849.zip Qt-a6e32ae1c84984041107a83db9307caffbda9849.tar.gz Qt-a6e32ae1c84984041107a83db9307caffbda9849.tar.bz2 | |
Make the macros QT_WA & QT_WA_INLINE only use the unicode part
Merge-request: 604
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| -rw-r--r-- | src/corelib/global/qglobal.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 00a9466..a522bcf 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1420,17 +1420,9 @@ inline QT3_SUPPORT bool qt_winUnicode() { return true; } inline QT3_SUPPORT int qWinVersion() { return QSysInfo::WindowsVersion; } #endif -#ifdef Q_OS_WINCE -#define QT_WA(uni, ansi) uni -#define QT_WA_INLINE(uni, ansi) (uni) -#elif defined(UNICODE) -#define QT_WA(uni, ansi) if (!(QSysInfo::windowsVersion() & QSysInfo::WV_DOS_based)) { uni } else { ansi } +#define QT_WA(unicode, ansi) unicode +#define QT_WA_INLINE(unicode, ansi) (unicode) -#define QT_WA_INLINE(uni, ansi) (!(QSysInfo::windowsVersion() & QSysInfo::WV_DOS_based) ? uni : ansi) -#else -#define QT_WA(uni, ansi) ansi -#define QT_WA_INLINE(uni, ansi) ansi -#endif #endif /* Q_WS_WIN */ #ifndef Q_OUTOFLINE_TEMPLATE |