From: Janne Anttila <janne.anttila@digia.com>
Date: Wed, 24 Apr 2013 09:00:54 +0000 (+0300)
Subject: Fix tst_qqmldebugjs and tst_qquickfolderlistmodel build for WinCE.
X-Git-Tag: upstream/5.2.1~798^2~135
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d6b4212b448686f415f3744969e5fb9769f4d98;p=platform%2Fupstream%2Fqtdeclarative.git

Fix tst_qqmldebugjs and tst_qquickfolderlistmodel build for WinCE.

tst_qqmldebugjs:
    Some WINCE header files define IN and OUT macros, and those make
    the following assignments in tst_qqmldebugjs.cpp to fail later on:
        const char *IN = "in"
        const char *OUT = "out"
    Since platform macros are not needed in the context of this file,
    undef them to make build pass for WinCE.

tst_qquickfolderlistmodel:
    WinCE does nothave drive letter concept, so lets execute the
    changeDrive test only on desktop Windows.

Change-Id: I5c159e3b3ee82e888aeac1da559fd63a875d089e
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
---

diff --git a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
index 9c2ba5b..424a3b3 100644
--- a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
+++ b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
@@ -53,6 +53,11 @@
 #include "qqmldebugclient.h"
 #include "../../../shared/util.h"
 
+#if defined (Q_OS_WINCE)
+#undef IN
+#undef OUT
+#endif
+
 const char *V8REQUEST = "v8request";
 const char *V8MESSAGE = "v8message";
 const char *SEQ = "seq";
diff --git a/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp b/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp
index a8bb887..9230608 100644
--- a/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp
+++ b/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp
@@ -73,7 +73,8 @@ private slots:
     void basicProperties();
     void resetFiltering();
     void refresh();
-#if defined (Q_OS_WIN)
+#if defined (Q_OS_WIN) && !defined (Q_OS_WINCE)
+    // WinCE does not have drive concept, so lets execute this test only on desktop Windows.
     void changeDrive();
 #endif
 
@@ -181,7 +182,7 @@ void tst_qquickfolderlistmodel::refresh()
     QTRY_COMPARE(removeEnd, count-1); // wait for refresh
 }
 
-#if defined (Q_OS_WIN)
+#if defined (Q_OS_WIN) && !defined (Q_OS_WINCE)
 void tst_qquickfolderlistmodel::changeDrive()
 {
     QSKIP("QTBUG-26728");