diff options
-rw-r--r-- | src/corelib/global/qglobal.h | 2 | ||||
-rw-r--r-- | src/corelib/global/qprocessordetection.h | 2 | ||||
-rw-r--r-- | src/corelib/global/qt_windows.h | 4 | ||||
-rw-r--r-- | src/corelib/kernel/qcoreapplication_win.cpp | 5 | ||||
-rw-r--r-- | src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | 8 | ||||
-rw-r--r-- | tests/auto/corelib/io/qprocess/testProcessEcho/main.cpp | 4 | ||||
-rw-r--r-- | tests/auto/corelib/io/qprocess/testProcessEnvironment/main.cpp | 5 | ||||
-rw-r--r-- | tests/auto/corelib/io/qprocess/testProcessOutput/main.cpp | 4 |
8 files changed, 2 insertions, 32 deletions
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 <ceconfig.h> -#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 diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp index 72be0d9f35..a7106c972b 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp +++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp @@ -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 diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho/main.cpp b/tests/auto/corelib/io/qprocess/testProcessEcho/main.cpp index 19f30de552..e18e48e516 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEcho/main.cpp +++ b/tests/auto/corelib/io/qprocess/testProcessEcho/main.cpp @@ -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 } diff --git a/tests/auto/corelib/io/qprocess/testProcessEnvironment/main.cpp b/tests/auto/corelib/io/qprocess/testProcessEnvironment/main.cpp index 4de359d83f..9f13f5c00f 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEnvironment/main.cpp +++ b/tests/auto/corelib/io/qprocess/testProcessEnvironment/main.cpp @@ -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 } diff --git a/tests/auto/corelib/io/qprocess/testProcessOutput/main.cpp b/tests/auto/corelib/io/qprocess/testProcessOutput/main.cpp index 07409166f2..4934708153 100644 --- a/tests/auto/corelib/io/qprocess/testProcessOutput/main.cpp +++ b/tests/auto/corelib/io/qprocess/testProcessOutput/main.cpp @@ -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); } |