From 271794fbc9cbeaa3393808691742893602de6cf5 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 30 Apr 2015 11:30:05 +0200 Subject: [PATCH] Remove some superfluous QT_VERSION_CHECKs. 5.4.0 is required these days. Change-Id: I0dc4c788b058f4c3fd2b9026fd7d6c7ab2840884 Reviewed-by: hjk --- src/libs/utils/mimetypes/mimemagicrule.cpp | 2 -- tests/auto/utils/fileutils/tst_fileutils.cpp | 7 +------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/libs/utils/mimetypes/mimemagicrule.cpp b/src/libs/utils/mimetypes/mimemagicrule.cpp index a9e339009f0..7dbcb4fd859 100644 --- a/src/libs/utils/mimetypes/mimemagicrule.cpp +++ b/src/libs/utils/mimetypes/mimemagicrule.cpp @@ -311,9 +311,7 @@ MimeMagicRule::MimeMagicRule(MimeMagicRule::Type theType, case RegExp: d->regexp.setPatternOptions(QRegularExpression::MultilineOption | QRegularExpression::DotMatchesEverythingOption -#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) | QRegularExpression::OptimizeOnFirstUsageOption -#endif ); d->regexp.setPattern(QString::fromUtf8(d->value)); if (!d->regexp.isValid()) { diff --git a/tests/auto/utils/fileutils/tst_fileutils.cpp b/tests/auto/utils/fileutils/tst_fileutils.cpp index dba6987f604..dd02f572e03 100644 --- a/tests/auto/utils/fileutils/tst_fileutils.cpp +++ b/tests/auto/utils/fileutils/tst_fileutils.cpp @@ -62,12 +62,7 @@ void tst_fileutils::parentDir_data() QTest::newRow("//") << "//" << "" << ""; QTest::newRow("/tmp/dir") << "/tmp/dir" << "/tmp" << ""; QTest::newRow("relative/path") << "relative/path" << "relative" << ""; - QTest::newRow("relativepath") << "relativepath" << "." -#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0) - << "see QTBUG-23892"; -#else - << ""; -#endif + QTest::newRow("relativepath") << "relativepath" << "."; // Windows stuff: #ifdef Q_OS_WIN