diff options
| author | kh1 <karsten.heimrich@digia.com> | 2014-06-13 13:26:24 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2014-06-16 17:56:39 +0200 |
| commit | 0c478e02cb25933e203cb62eca995d3215cf1cb8 (patch) | |
| tree | 923e90eb5deb1dff0db24bcbeb324406671524fa /tests | |
| parent | ab724c0a379d9b5f115b69cf2dd405cedc06e053 (diff) | |
Some more Qt5 QT_VERSION fixes.
Change-Id: I1b3596939cd4aca2b91da3f5b09f50f2639b6fbd
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'tests')
3 files changed, 2 insertions, 18 deletions
diff --git a/tests/auto/installer/lib7zfacade/tst_lib7zfacade.cpp b/tests/auto/installer/lib7zfacade/tst_lib7zfacade.cpp index 5b88c0074..90d66c1bd 100644 --- a/tests/auto/installer/lib7zfacade/tst_lib7zfacade.cpp +++ b/tests/auto/installer/lib7zfacade/tst_lib7zfacade.cpp @@ -94,11 +94,7 @@ private slots: QVector<Lib7z::File> files = Lib7z::listArchive(&file); QCOMPARE(files.count(), 1); #ifdef Q_OS_UNIX - #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/auto/installer/settingsoperation/tst_settingsoperation.cpp b/tests/auto/installer/settingsoperation/tst_settingsoperation.cpp index f663297ec..4d9582095 100644 --- a/tests/auto/installer/settingsoperation/tst_settingsoperation.cpp +++ b/tests/auto/installer/settingsoperation/tst_settingsoperation.cpp @@ -287,11 +287,7 @@ private slots: QCOMPARE(verifySettings.value(testKeys.at(0)).isNull(), false); QStringList verifyFirstValue = verifySettings.value(testKeys.at(0)).toStringList(); -#if QT_VERSION < 0x050000 - QCOMPARE(verifyFirstValue.contains(QLatin1String("value3")), QBool(false)); -#else QCOMPARE(verifyFirstValue.contains(QLatin1String("value3")), false); -#endif QCOMPARE(verifySettings.value(testKeys.at(0)), verifySettings.value(testKeys.at(1))); QCOMPARE(verifySettings.value(testKeys.at(1)), verifySettings.value(testKeys.at(2))); } diff --git a/tests/environmentvariable/environmentvariabletest.cpp b/tests/environmentvariable/environmentvariabletest.cpp index 472992214..5fe484a29 100644 --- a/tests/environmentvariable/environmentvariabletest.cpp +++ b/tests/environmentvariable/environmentvariabletest.cpp @@ -60,11 +60,7 @@ EnvironmentVariableTest::EnvironmentVariableTest() void EnvironmentVariableTest::testPersistentNonSystem() { #ifndef Q_OS_WIN - #if QT_VERSION < 0x050000 - QSKIP("This operation only works on Windows", SkipSingle); - #else - QSKIP("This operation only works on Windows"); - #endif + QSKIP("This operation only works on Windows"); #endif KDUpdater::Application app; QString key = QLatin1String("IFW_TestKey"); @@ -93,11 +89,7 @@ void EnvironmentVariableTest::testPersistentNonSystem() void EnvironmentVariableTest::testNonPersistentNonSystem() { #ifndef Q_OS_WIN - #if QT_VERSION < 0x050000 - QSKIP("This operation only works on Windows", SkipSingle); - #else - QSKIP("This operation only works on Windows"); - #endif + QSKIP("This operation only works on Windows"); #endif KDUpdater::Application app; QString key = QLatin1String("IFW_TestKey"); |