feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove some superfluous QT_VERSION_CHECKs.

Browse Source 
5.4.0 is required these days.

Change-Id: I0dc4c788b058f4c3fd2b9026fd7d6c7ab2840884
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Christian Kandeler
2015-04-30 11:30:05 +02:00
parent d9e11e8d40
commit 271794fbc9
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/mimetypes/mimemagicrule.cpp
View File

@@ -311,9 +311,7 @@ MimeMagicRule::MimeMagicRule(MimeMagicRule::Type theType,
case RegExp: case RegExp:
d->regexp.setPatternOptions(QRegularExpression::MultilineOption d->regexp.setPatternOptions(QRegularExpression::MultilineOption
| QRegularExpression::DotMatchesEverythingOption | QRegularExpression::DotMatchesEverythingOption
#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
| QRegularExpression::OptimizeOnFirstUsageOption | QRegularExpression::OptimizeOnFirstUsageOption
#endif
); );
d->regexp.setPattern(QString::fromUtf8(d->value)); d->regexp.setPattern(QString::fromUtf8(d->value));
if (!d->regexp.isValid()) { if (!d->regexp.isValid()) {

7
tests/auto/utils/fileutils/tst_fileutils.cpp
View File

@@ -62,12 +62,7 @@ void tst_fileutils::parentDir_data()
QTest::newRow("//") << "//" << "" << ""; QTest::newRow("//") << "//" << "" << "";
QTest::newRow("/tmp/dir") << "/tmp/dir" << "/tmp" << ""; QTest::newRow("/tmp/dir") << "/tmp/dir" << "/tmp" << "";
QTest::newRow("relative/path") << "relative/path" << "relative" << ""; QTest::newRow("relative/path") << "relative/path" << "relative" << "";
QTest::newRow("relativepath") << "relativepath" << "." QTest::newRow("relativepath") << "relativepath" << ".";
#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
<< "see QTBUG-23892";
#else
<< "";
#endif
// Windows stuff: // Windows stuff:
#ifdef Q_OS_WIN #ifdef Q_OS_WIN