summaryrefslogtreecommitdiffstats
path: root/tests/auto/windowsmobile
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/windowsmobile')
-rw-r--r--tests/auto/windowsmobile/test/test.pro3
-rw-r--r--tests/auto/windowsmobile/test/tst_windowsmobile.cpp4
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/windowsmobile/test/test.pro b/tests/auto/windowsmobile/test/test.pro
index 5da45b2..b7f65a9 100644
--- a/tests/auto/windowsmobile/test/test.pro
+++ b/tests/auto/windowsmobile/test/test.pro
@@ -8,8 +8,7 @@ RESOURCES += windowsmobile.qrc
TARGET = tst_windowsmobile
wincewm*: {
- addFiles.sources = \
- $$QT_BUILD_TREE/tests/auto/windowsmobile/testQMenuBar/*.exe
+ addFiles.sources = $$OUT_PWD/../testQMenuBar/*.exe
addFiles.path = "\Program Files\tst_windowsmobile"
diff --git a/tests/auto/windowsmobile/test/tst_windowsmobile.cpp b/tests/auto/windowsmobile/test/tst_windowsmobile.cpp
index a49e9a6..2d7c9ea 100644
--- a/tests/auto/windowsmobile/test/tst_windowsmobile.cpp
+++ b/tests/auto/windowsmobile/test/tst_windowsmobile.cpp
@@ -44,8 +44,10 @@
#include <QtCore/QDebug>
#include <QtCore/QObject>
#include <QtGui>
+#ifdef Q_OS_WINCE_WM
#include <windows.h>
#include "ddhelper.h"
+#endif
@@ -70,7 +72,7 @@ public:
#if defined(Q_OS_WINCE_WM) && defined(_WIN32_WCE) && _WIN32_WCE <= 0x501
bool qt_wince_is_platform(const QString &platformString) {
- TCHAR tszPlatform[64];
+ wchar_t tszPlatform[64];
if (SystemParametersInfo(SPI_GETPLATFORMTYPE,
sizeof(tszPlatform)/sizeof(*tszPlatform),tszPlatform,0))
if (0 == _tcsicmp(reinterpret_cast<const wchar_t *> (platformString.utf16()), tszPlatform))