From 9d6b4212b448686f415f3744969e5fb9769f4d98 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Wed, 24 Apr 2013 12:00:54 +0300 Subject: [PATCH] Fix tst_qqmldebugjs and tst_qquickfolderlistmodel build for WinCE. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Friedemann Kleint Reviewed-by: Andreas Holzammer --- tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp | 5 +++++ tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) 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"); -- 2.7.4