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/global/qglobal.h | |
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/global/qglobal.h')
-rw-r--r-- | src/corelib/global/qglobal.h | 72 |
1 files changed, 2 insertions, 70 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index d72de75545..9780c2f96e 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -210,14 +210,6 @@ namespace QT_NAMESPACE {} # define QT_NO_GETIFADDRS #elif defined(__CYGWIN__) # define Q_OS_CYGWIN -#elif defined(MSDOS) || defined(_MSDOS) -# define Q_OS_MSDOS -#elif defined(__OS2__) -# if defined(__EMX__) -# define Q_OS_OS2EMX -# else -# define Q_OS_OS2 -# endif #elif !defined(SAG_COM) && (defined(WIN64) || defined(_WIN64) || defined(__WIN64__)) # define Q_OS_WIN32 # define Q_OS_WIN64 @@ -298,7 +290,7 @@ namespace QT_NAMESPACE {} # endif #endif -#if defined(Q_OS_MSDOS) || defined(Q_OS_OS2) || defined(Q_OS_WIN) +#if defined(Q_OS_WIN) # undef Q_OS_UNIX #elif !defined(Q_OS_UNIX) # define Q_OS_UNIX @@ -854,54 +846,6 @@ namespace QT_NAMESPACE {} # endif #endif -/* - The window system, must be one of: (Q_WS_x) - - MACX - Mac OS X - MAC9 - Mac OS 9 - QWS - Qt for Embedded Linux - WIN32 - Windows - X11 - X Window System - S60 - Symbian S60 - PM - unsupported - WIN16 - unsupported -*/ - -#if defined (Q_WS_QPA) - -#elif defined(Q_OS_MSDOS) -# define Q_WS_WIN16 -# error "Qt requires Win32 and does not work with Windows 3.x" -#elif defined(_WIN32_X11_) -# define Q_WS_X11 -#elif defined(Q_OS_WIN32) -# define Q_WS_WIN32 -# if defined(Q_OS_WIN64) -# define Q_WS_WIN64 -# endif -#elif defined(Q_OS_WINCE) -# define Q_WS_WIN32 -# define Q_WS_WINCE -# if defined(Q_OS_WINCE_WM) -# define Q_WS_WINCE_WM -# endif -#elif defined(Q_OS_OS2) -# define Q_WS_PM -# error "Qt does not work with OS/2 Presentation Manager or Workplace Shell" -#elif defined(Q_OS_UNIX) -# if defined(Q_OS_SYMBIAN) -# if !defined(QT_NO_S60) -# define Q_WS_S60 -# endif -# elif !defined(Q_WS_QWS) && !defined(Q_WS_QPA) -# define Q_WS_X11 -# endif -#endif - -#if defined(Q_WS_WIN16) || defined(Q_WS_WIN32) || defined(Q_WS_WINCE) -# define Q_WS_WIN -#endif - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -1186,13 +1130,7 @@ Q_DECL_CONSTEXPR inline const T &qBound(const T &min, const T &val, const T &max class QDataStream; -#if defined(Q_WS_MAC) -# ifndef QMAC_QMENUBAR_NO_EVENT -# define QMAC_QMENUBAR_NO_EVENT -# endif -#endif - -#if !defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) # define QT_NO_COP #endif @@ -2730,12 +2668,6 @@ QT_LICENSED_MODULE(DBus) # endif #endif -#if !(defined(Q_WS_WIN) && !defined(Q_WS_WINCE)) \ - && !(defined(Q_WS_X11) && !defined(QT_NO_FREETYPE)) \ - && !(defined(Q_WS_QPA)) -# define QT_NO_RAWFONT -#endif - namespace QtPrivate { //like std::enable_if template <bool B, typename T = void> struct QEnableIf; |