diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-21 09:55:40 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-24 11:04:04 +0200 |
| commit | 1d01bc1e83560cb2fc4f9f7f00762ffa5134448a (patch) | |
| tree | 04bd3d0fa16ce4515360f9c65bec9cffa370749f /src/corelib/codecs | |
| parent | ccf27301e04addef0ed0cb6c7e832216cc3c12a8 (diff) | |
corelib: Remove Q_WS-macros.
Q_WS_QPA is the only active code path after merging
refactor, other Q_WS-macros are no longer used.
Enable compilation without -qpa.
- Remove Q_OS_MSDOS, Q_OS_OS2
- Remove Q_WS_QWS
- Remove/replace definitions/conditionals of Q_WS_XX
- Remove qpa branches from profiles
- Replace Q_WS_MAC by Q_OS_MAC
- Replace Q_WS_MAC && !Q_WS_QPA by
Q_OS_MAC && !QT_NO_CORESERVICES
- Similarly in profiles: mac:contains(QT_CONFIG, coreservices)
- Replace Q_FS_FAT by Q_OS_WIN
Change-Id: Icce5a6c55b052c8f72b3b979ddf31a4f388ea9c9
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src/corelib/codecs')
| -rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index f28133be77..42fac98a71 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -74,7 +74,7 @@ # include "../../plugins/codecs/kr/qeuckrcodec.h" # include "../../plugins/codecs/tw/qbig5codec.h" # endif // QT_NO_ICONV -# if defined(Q_WS_X11) && !defined(QT_BOOTSTRAPPED) +# if defined(Q_OS_UNIX) && !defined(QT_BOOTSTRAPPED) # include "qfontlaocodec_p.h" # include "../../plugins/codecs/jp/qfontjpcodec.h" # endif @@ -756,7 +756,7 @@ static void setup() localeMapper = QSymbianTextCodec::init(); #endif -# if defined(Q_WS_X11) && !defined(QT_BOOTSTRAPPED) +# if defined(Q_OS_UNIX) && !defined(QT_BOOTSTRAPPED) // no font codecs when bootstrapping (void)new QFontLaoCodec; # if defined(QT_NO_ICONV) @@ -770,7 +770,7 @@ static void setup() (void)new QFontBig5hkscsCodec; (void)new QFontBig5Codec; # endif // QT_NO_ICONV && !QT_BOOTSTRAPPED -# endif // Q_WS_X11 +# endif // Q_OS_UNIX #if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_INTEGRITY) |