diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2014-01-22 18:06:15 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2014-01-22 18:06:48 +0100 |
| commit | 86b9ab3328b88a3fda08378b162158c58324414d (patch) | |
| tree | 444256775b3d6828b1ce55eced8ea34a80ee8aeb /tests | |
| parent | f1e66fe1bb8d0ddd91dee6be7bdb4f76c7cd98b9 (diff) | |
| parent | 54409e9701321380b41c96dbd4c851f6cc4cb766 (diff) | |
Merge remote-tracking branch 'origin/1.5'
Change-Id: Ic9f2e152046b69e38f24b51f8d7c0dc4ce17d076
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/installer/lib7zfacade/tst_lib7zfacade.cpp | 6 | ||||
| -rw-r--r-- | tests/environmentvariable/environmentvariabletest.cpp | 12 |
2 files changed, 15 insertions, 3 deletions
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<Lib7z::File> 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"); |