From 54409e9701321380b41c96dbd4c851f6cc4cb766 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Mon, 20 Jan 2014 17:25:20 +0100 Subject: fix that QSKIP has one argument since Qt 5 Change-Id: I134f61e1ea9a50264a155799d447965beaab14f9 Reviewed-by: Niels Weber Reviewed-by: Karsten Heimrich --- tests/auto/installer/lib7zfacade/tst_lib7zfacade.cpp | 6 +++++- tests/environmentvariable/environmentvariabletest.cpp | 12 ++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/auto/installer/lib7zfacade/tst_lib7zfacade.cpp b/tests/auto/installer/lib7zfacade/tst_lib7zfacade.cpp index bae42fed9..5b88c0074 100644 --- a/tests/auto/installer/lib7zfacade/tst_lib7zfacade.cpp +++ b/tests/auto/installer/lib7zfacade/tst_lib7zfacade.cpp @@ -94,7 +94,11 @@ private slots: QVector files = Lib7z::listArchive(&file); QCOMPARE(files.count(), 1); #ifdef Q_OS_UNIX - QSKIP("This test requires the tme handling to be repaired first.", SkipSingle); + #if QT_VERSION < 0x050000 + QSKIP("This test requires the time handling to be repaired first.", SkipSingle); + #else + QSKIP("This test requires the time handling to be repaired first."); + #endif #endif QCOMPARE(files.first(), m_file); } diff --git a/tests/environmentvariable/environmentvariabletest.cpp b/tests/environmentvariable/environmentvariabletest.cpp index c9766e619..472992214 100644 --- a/tests/environmentvariable/environmentvariabletest.cpp +++ b/tests/environmentvariable/environmentvariabletest.cpp @@ -60,7 +60,11 @@ EnvironmentVariableTest::EnvironmentVariableTest() void EnvironmentVariableTest::testPersistentNonSystem() { #ifndef Q_OS_WIN - QSKIP("This operation only works on Windows",SkipSingle); + #if QT_VERSION < 0x050000 + QSKIP("This operation only works on Windows", SkipSingle); + #else + QSKIP("This operation only works on Windows"); + #endif #endif KDUpdater::Application app; QString key = QLatin1String("IFW_TestKey"); @@ -89,7 +93,11 @@ void EnvironmentVariableTest::testPersistentNonSystem() void EnvironmentVariableTest::testNonPersistentNonSystem() { #ifndef Q_OS_WIN - QSKIP("This operation only works on Windows",SkipSingle); + #if QT_VERSION < 0x050000 + QSKIP("This operation only works on Windows", SkipSingle); + #else + QSKIP("This operation only works on Windows"); + #endif #endif KDUpdater::Application app; QString key = QLatin1String("IFW_TestKey"); -- cgit v1.2.3