From e164baa4a22203361aa5721c8a9fe9c8529345e0 Mon Sep 17 00:00:00 2001 From: jaanttil Date: Fri, 11 Nov 2011 14:20:52 +0200 Subject: Fix 3 autotest build faulures for WinCE Change-Id: I67af7b1b31be3c6d99abf2344bcfd93fd5f77bf6 Reviewed-by: Andreas Holzammer Reviewed-by: Rohan McGovern Reviewed-by: Joerg Bornemann --- tests/auto/qdiriterator/tst_qdiriterator.cpp | 2 +- tests/auto/qfileinfo/tst_qfileinfo.cpp | 2 ++ tests/auto/qlayout/qlayout.pro | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/auto/qdiriterator/tst_qdiriterator.cpp b/tests/auto/qdiriterator/tst_qdiriterator.cpp index ce4a3c5..0141660 100644 --- a/tests/auto/qdiriterator/tst_qdiriterator.cpp +++ b/tests/auto/qdiriterator/tst_qdiriterator.cpp @@ -599,7 +599,7 @@ void tst_QDirIterator::qtbug15421_hiddenDirs_hiddenFiles() // a special call since hidden files need to be "marked" while in Unix // anything starting by a '.' is a hidden file. // For that reason this test is not run in Windows. -#if defined Q_OS_WIN || Q_OS_WINCE +#if defined (Q_OS_WIN) || defined (Q_OS_WINCE) QSKIP("To create hidden files a special call is required in Windows.", SkipAll); #else // Only files diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp index 5cd72cb..0c81ba2 100644 --- a/tests/auto/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp @@ -61,8 +61,10 @@ #define _WIN32_WINNT 0x500 #include #include +#ifndef Q_OS_WINCE #include #endif +#endif #include #include #ifdef Q_OS_SYMBIAN diff --git a/tests/auto/qlayout/qlayout.pro b/tests/auto/qlayout/qlayout.pro index a541e9f..b8745c9 100644 --- a/tests/auto/qlayout/qlayout.pro +++ b/tests/auto/qlayout/qlayout.pro @@ -6,6 +6,7 @@ SOURCES += tst_qlayout.cpp contains(QT_CONFIG, qt3support): QT += qt3support wince*|symbian: { + wince*:DEFINES += SRCDIR=\\\"\\\" addFiles.files = baseline addFiles.path = . DEPLOYMENT += addFiles -- cgit v0.12