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 <Friedemann.Kleint@qt.io>
bb10
Joerg Bornemann 2016-05-30 18:05:39 +02:00
parent f08da97186
commit 5803a9ba57
8 changed files with 2 additions and 32 deletions

View File

@ -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)

View File

@ -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!"

View File

@ -67,10 +67,6 @@
# define _WIN32_IE 0x0501
#endif
#ifdef _WIN32_WCE
#include <ceconfig.h>
#endif
// already defined when compiled with WINVER >= 0x0500
#ifndef SPI_SETMENUANIMATION
#define SPI_SETMENUANIMATION 0x1003

View File

@ -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

View File

@ -1871,7 +1871,6 @@ namespace QWindowsDialogs {
// QWindowsDialogHelperBase creation functions
bool useHelper(QPlatformTheme::DialogType type)
{
#if !defined(_WIN32_WCE) || _WIN32_WCE < 0x800
if (QWindowsIntegration::instance()->options() & QWindowsIntegration::NoNativeDialogs)
return false;
switch (type) {
@ -1890,14 +1889,10 @@ bool useHelper(QPlatformTheme::DialogType type)
break;
}
return false;
#else
return false;
#endif // !defined(_WIN32_WCE) || _WIN32_WCE < 0x800
}
QPlatformDialogHelper *createHelper(QPlatformTheme::DialogType type)
{
#if !defined(_WIN32_WCE) || _WIN32_WCE < 0x800
if (QWindowsIntegration::instance()->options() & QWindowsIntegration::NoNativeDialogs)
return 0;
switch (type) {
@ -1921,9 +1916,6 @@ QPlatformDialogHelper *createHelper(QPlatformTheme::DialogType type)
break;
}
return 0;
#else
return 0;
#endif // !defined(_WIN32_WCE) || _WIN32_WCE < 0x800
}
} // namespace QWindowsDialogs

View File

@ -31,9 +31,6 @@
int main()
{
#if defined(_WIN32_WCE) && defined(_X86_)
return 0;
#else
int c;
while ((c = fgetc(stdin)) != -1) {
if (c == '\0')
@ -42,5 +39,4 @@ int main()
fflush(stdout);
}
return 0;
#endif
}

View File

@ -31,10 +31,6 @@
int main(int argc, char **argv)
{
#if defined(_WIN32_WCE)
// no environment in Windows CE
return 0;
#else
if (argc == 1)
return 1;
@ -44,5 +40,4 @@ int main(int argc, char **argv)
return 0;
}
return 1;
#endif
}

View File

@ -31,11 +31,7 @@
int main()
{
#if defined(_WIN32_WCE)
for (int i=0; i<240; i++) {
#else //fprintf Output is very slow on Windows CE
for (int i=0; i<10240; i++) {
#endif
fprintf(stdout, "%d -this is a number\n", i);
fflush(stderr);
}