From 0d84dab38059345f51e8318d2474068e817ac007 Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Wed, 5 Mar 2014 10:23:08 +0200 Subject: Fix qquickfolderlistmodel test compilation on WinRT Like WinCE, the changeDrive() test should be disabled on WinRT. Change-Id: I85749b84fef372e166fe52c263225478094ccdb4 Reviewed-by: Friedemann Kleint Reviewed-by: Joerg Bornemann --- tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp b/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp index e03befe25a..a6e6345223 100644 --- a/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp +++ b/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp @@ -75,8 +75,8 @@ private slots: void resetFiltering(); void refresh(); void cdUp(); -#if defined (Q_OS_WIN) && !defined (Q_OS_WINCE) - // WinCE does not have drive concept, so lets execute this test only on desktop Windows. +#ifdef Q_OS_WIN32 + // WinCE/WinRT do not have drive APIs, so let's execute this test only on desktop Windows. void changeDrive(); #endif void showDotAndDotDot(); @@ -240,7 +240,7 @@ void tst_qquickfolderlistmodel::cdUp() } } -#if defined (Q_OS_WIN) && !defined (Q_OS_WINCE) +#ifdef Q_OS_WIN32 void tst_qquickfolderlistmodel::changeDrive() { QSKIP("QTBUG-26728"); -- cgit v1.2.3