Commit 353f6cbf authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

it depends against qt5.15

parent 8c4b1c16
...@@ -128,11 +128,7 @@ void BugzillaManager::setFeaturesForVersion(const QString& version) ...@@ -128,11 +128,7 @@ void BugzillaManager::setFeaturesForVersion(const QString& version)
// the change should actually be implemented. // the change should actually be implemented.
const int nVersionParts = 3; const int nVersionParts = 3;
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
QStringList digits = version.split(QRegularExpression(QStringLiteral("[._-]")), QString::SkipEmptyParts);
#else
QStringList digits = version.split(QRegularExpression(QStringLiteral("[._-]")), Qt::SkipEmptyParts); QStringList digits = version.split(QRegularExpression(QStringLiteral("[._-]")), Qt::SkipEmptyParts);
#endif
while (digits.count() < nVersionParts) { while (digits.count() < nVersionParts) {
digits << QLatin1String("0"); digits << QLatin1String("0");
} }
......
...@@ -51,11 +51,7 @@ void ProductMapping::mapUsingInternalFile(const QString & appName) ...@@ -51,11 +51,7 @@ void ProductMapping::mapUsingInternalFile(const QString & appName)
if (mappings.hasKey(appName)) { if (mappings.hasKey(appName)) {
QString mappingString = mappings.readEntry(appName); QString mappingString = mappings.readEntry(appName);
if (!mappingString.isEmpty()) { if (!mappingString.isEmpty()) {
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
QStringList list = mappingString.split(QLatin1Char('|'), QString::SkipEmptyParts);
#else
QStringList list = mappingString.split(QLatin1Char('|'), Qt::SkipEmptyParts); QStringList list = mappingString.split(QLatin1Char('|'), Qt::SkipEmptyParts);
#endif
if (list.count()==2) { if (list.count()==2) {
m_bugzillaProduct = list.at(0); m_bugzillaProduct = list.at(0);
m_bugzillaComponent = list.at(1); m_bugzillaComponent = list.at(1);
...@@ -87,11 +83,7 @@ void ProductMapping::getRelatedProductsUsingInternalFile(const QString & bugzill ...@@ -87,11 +83,7 @@ void ProductMapping::getRelatedProductsUsingInternalFile(const QString & bugzill
"(or there was an error when reading)"; "(or there was an error when reading)";
return; return;
} }
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
groups = group.split(QLatin1Char('|'), QString::SkipEmptyParts);
#else
groups = group.split(QLatin1Char('|'), Qt::SkipEmptyParts); groups = group.split(QLatin1Char('|'), Qt::SkipEmptyParts);
#endif
} }
//All KDE apps use the KDE Platform (basic libs) //All KDE apps use the KDE Platform (basic libs)
...@@ -106,11 +98,7 @@ void ProductMapping::getRelatedProductsUsingInternalFile(const QString & bugzill ...@@ -106,11 +98,7 @@ void ProductMapping::getRelatedProductsUsingInternalFile(const QString & bugzill
if (bzGroups.hasKey(group)) { if (bzGroups.hasKey(group)) {
QString bzGroup = bzGroups.readEntry(group); QString bzGroup = bzGroups.readEntry(group);
if (!bzGroup.isEmpty()) { if (!bzGroup.isEmpty()) {
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
QStringList relatedGroups = bzGroup.split(QLatin1Char('|'), QString::SkipEmptyParts);
#else
QStringList relatedGroups = bzGroup.split(QLatin1Char('|'), Qt::SkipEmptyParts); QStringList relatedGroups = bzGroup.split(QLatin1Char('|'), Qt::SkipEmptyParts);
#endif
if (relatedGroups.size()>0) { if (relatedGroups.size()>0) {
m_relatedBugzillaProducts.append(relatedGroups); m_relatedBugzillaProducts.append(relatedGroups);
} }
......
...@@ -65,11 +65,7 @@ QString Debugger::tryExec() const ...@@ -65,11 +65,7 @@ QString Debugger::tryExec() const
QStringList Debugger::supportedBackends() const QStringList Debugger::supportedBackends() const
{ {
return isValid() ? m_config->group("General").readEntry("Backends") return isValid() ? m_config->group("General").readEntry("Backends")
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
.split(QLatin1Char('|'), QString::SkipEmptyParts) : QStringList();
#else
.split(QLatin1Char('|'), Qt::SkipEmptyParts) : QStringList(); .split(QLatin1Char('|'), Qt::SkipEmptyParts) : QStringList();
#endif
} }
void Debugger::setUsedBackend(const QString & backendName) void Debugger::setUsedBackend(const QString & backendName)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment