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/tools | |
| 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/tools')
| -rw-r--r-- | src/corelib/tools/qdatetime.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qrect.h | 3 | ||||
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index 3d3bc55d71..3c8848ba0f 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -69,7 +69,7 @@ # define QDTPDEBUGN if (false) qDebug #endif -#if defined(Q_WS_MAC) +#if defined(Q_OS_MAC) #include <private/qcore_mac_p.h> #endif diff --git a/src/corelib/tools/qrect.h b/src/corelib/tools/qrect.h index 5d6db9867e..58221f4739 100644 --- a/src/corelib/tools/qrect.h +++ b/src/corelib/tools/qrect.h @@ -146,9 +146,6 @@ public: friend Q_CORE_EXPORT_INLINE bool operator!=(const QRect &, const QRect &); private: -#if defined(Q_WS_X11) - friend void qt_setCoords(QRect *r, int xp1, int yp1, int xp2, int yp2); -#endif // ### Qt 5; remove the ifdef and just have the same order on all platforms. #if defined(Q_OS_MAC) int y1; diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 9278c7b97f..8e31afbee8 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -3668,7 +3668,7 @@ QByteArray QString::toAscii() const return toLatin1(); } -#if !defined(Q_WS_MAC) && defined(Q_OS_UNIX) +#if !defined(Q_OS_MAC) && defined(Q_OS_UNIX) static QByteArray toLocal8Bit_helper(const QChar *data, int length) { #ifndef QT_NO_TEXTCODEC |