diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-03-09 14:55:52 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-04-06 10:56:02 +0000 |
| commit | 8104729e63dea923ce64149af67e51ad84ad386a (patch) | |
| tree | 0904260ec7a7f927a8dc7e2c9d16e5b4baa08b23 /src/testlib/qtestcase.cpp | |
| parent | ed2490433f379914b082e6b4ee04dc35b9d85cb7 (diff) | |
QtTest: Remove Windows CE.
Remove #ifdef sections for Q_OS_WINCE and wince .pro file clauses in library
and tests.
Task-number: QTBUG-51673
Change-Id: I552b3fe8d6e0eb7c8c7b3a3d41558e5e21904dd2
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/testlib/qtestcase.cpp')
| -rw-r--r-- | src/testlib/qtestcase.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index d5b4ae218f..0ee75d484a 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -87,11 +87,9 @@ #endif #ifdef Q_OS_WIN -#ifndef Q_OS_WINCE # if !defined(Q_CC_MINGW) || (defined(Q_CC_MINGW) && defined(__MINGW64_VERSION_MAJOR)) # include <crtdbg.h> # endif -#endif #include <windows.h> // for Sleep #endif #ifdef Q_OS_UNIX @@ -1432,7 +1430,7 @@ FatalSignalHandler::~FatalSignalHandler() } // namespace -#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT) +#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) // Helper class for resolving symbol names by dynamically loading "dbghelp.dll". class DebugSymbolResolver @@ -1570,7 +1568,7 @@ static LONG WINAPI windowsFaultHandler(struct _EXCEPTION_POINTERS *exInfo) return EXCEPTION_EXECUTE_HANDLER; } -#endif // Q_OS_WIN) && !Q_OS_WINCE && !Q_OS_WINRT +#endif // Q_OS_WIN) && !Q_OS_WINRT static void initEnvironment() { @@ -1662,7 +1660,7 @@ int QTest::qExec(QObject *testObject, int argc, char **argv) qtest_qParseArgs(argc, argv, false); -#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) +#if defined(Q_OS_WIN) if (!noCrashHandler) { # ifndef Q_CC_MINGW _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG); @@ -1672,7 +1670,7 @@ int QTest::qExec(QObject *testObject, int argc, char **argv) SetUnhandledExceptionFilter(windowsFaultHandler); # endif } // !noCrashHandler -#endif // Q_OS_WIN) && !Q_OS_WINCE && !Q_OS_WINRT +#endif // Q_OS_WIN #ifdef QTESTLIB_USE_VALGRIND if (QBenchmarkGlobalData::current->mode() == QBenchmarkGlobalData::CallgrindParentProcess) { |