From 5803a9ba5718cd8b79321e3291fdae952f7c55e1 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 30 May 2016 18:05:39 +0200 Subject: Remove Windows CE vestiges Remove every usage of the _WIN32_WCE macro outside of 3rd party source code directories. Change-Id: Ia7e859bd6dcaef10c66674612c8e440f9a2dee56 Reviewed-by: Friedemann Kleint --- src/corelib/global/qglobal.h | 2 +- src/corelib/global/qprocessordetection.h | 2 +- src/corelib/global/qt_windows.h | 4 ---- src/corelib/kernel/qcoreapplication_win.cpp | 5 ----- 4 files changed, 2 insertions(+), 11 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 78b7cec915..cf647ea20d 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -469,7 +469,7 @@ typedef qptrdiff qintptr; # define QT_ASCII_CAST_WARN #endif -#if defined(__i386__) || defined(_WIN32) || defined(_WIN32_WCE) +#if defined(__i386__) || defined(_WIN32) # if defined(Q_CC_GNU) # define QT_FASTCALL __attribute__((regparm(3))) # elif defined(Q_CC_MSVC) diff --git a/src/corelib/global/qprocessordetection.h b/src/corelib/global/qprocessordetection.h index 6ecd41bc30..566d76d3d2 100644 --- a/src/corelib/global/qprocessordetection.h +++ b/src/corelib/global/qprocessordetection.h @@ -334,7 +334,7 @@ # elif defined(__BIG_ENDIAN__) || defined(_big_endian__) || defined(_BIG_ENDIAN) # define Q_BYTE_ORDER Q_BIG_ENDIAN # elif defined(__LITTLE_ENDIAN__) || defined(_little_endian__) || defined(_LITTLE_ENDIAN) \ - || defined(_WIN32_WCE) || defined(WINAPI_FAMILY) // Windows CE is always little-endian according to MSDN. + || defined(WINAPI_FAMILY) // WinRT is always little-endian according to MSDN. # define Q_BYTE_ORDER Q_LITTLE_ENDIAN # else # error "Unable to determine byte order!" diff --git a/src/corelib/global/qt_windows.h b/src/corelib/global/qt_windows.h index 6d4c56d7d6..7b95501c08 100644 --- a/src/corelib/global/qt_windows.h +++ b/src/corelib/global/qt_windows.h @@ -67,10 +67,6 @@ # define _WIN32_IE 0x0501 #endif -#ifdef _WIN32_WCE -#include -#endif - // already defined when compiled with WINVER >= 0x0500 #ifndef SPI_SETMENUANIMATION #define SPI_SETMENUANIMATION 0x1003 diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp index 8ad4ba273c..342e6227f2 100644 --- a/src/corelib/kernel/qcoreapplication_win.cpp +++ b/src/corelib/kernel/qcoreapplication_win.cpp @@ -178,11 +178,6 @@ QT_END_INCLUDE_NAMESPACE # define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) # define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) #endif -#ifdef _WIN32_WCE -# ifndef WM_NCACTIVATE -# define WM_NCACTIVATE 0x86 -# endif -#endif // The values below should never change. Note that none of the usual // WM_...FIRST & WM_...LAST values are in the list, as they normally have other -- cgit v1.2.3