diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2013-09-01 19:05:46 +0300 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@digia.com> | 2013-09-02 13:43:19 +0200 |
| commit | 06c1ec4dd1df6e0bc417241bd15f164b38de87b3 (patch) | |
| tree | 0b29ca3d73bcdf22664cd6e63703258de7bfa565 /tests/baselineserver | |
| parent | ce65e5ef6fd1da5de952b9491942083aedeacd40 (diff) | |
| download | qtbase-winrt.tar.gz | |
WinRT: Fix various test compilationswinrt
- Remove irrelevant test subdirs via .pro files
- Follow WinCE codepaths where applicable
- Replace unsupported Win32 APIs with WinRT equivalents
This does not aim to fix any failures in the tests themselves; it only
makes them compile.
Change-Id: Ia82bc0cc402891f8f6238d4c261ee9152b51be80
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'tests/baselineserver')
| -rw-r--r-- | tests/baselineserver/shared/baselineprotocol.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/baselineserver/shared/baselineprotocol.cpp b/tests/baselineserver/shared/baselineprotocol.cpp index cbe3ec8798..d9dcbc5a38 100644 --- a/tests/baselineserver/shared/baselineprotocol.cpp +++ b/tests/baselineserver/shared/baselineprotocol.cpp @@ -76,7 +76,11 @@ const QString PI_PulseTestrBranch(QLS("PulseTestrBranch")); void BaselineProtocol::sysSleep(int ms) { #if defined(Q_OS_WIN) +# ifndef Q_OS_WINRT Sleep(DWORD(ms)); +# else + WaitForSingleObjectEx(GetCurrentThread(), ms, false); +# endif #else struct timespec ts = { ms / 1000, (ms % 1000) * 1000 * 1000 }; nanosleep(&ts, NULL); @@ -116,6 +120,7 @@ PlatformInfo PlatformInfo::localHostInfo() pi.insert(PI_OSName, QLS("Other")); #endif +#ifndef QT_NO_PROCESS QProcess git; QString cmd; QStringList args; @@ -151,7 +156,7 @@ PlatformInfo PlatformInfo::localHostInfo() pi.insert(PI_PulseGitBranch, QString::fromLatin1(gb)); } } - +#endif // !QT_NO_PROCESS return pi; } |