whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove QRegExp usage from the the OCI plugin 

Change-Id: I95009b5bc6f9ce4356e707e07c5cb7346aaf9245
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
bb10
Lars Knoll 2020-03-15 14:52:43 +01:00
parent b798b2cbb4
commit befd198c15
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/sqldrivers/oci/qsql_oci.cpp
View File

@ -43,7 +43,9 @@
#include <qvariant.h>
#include <qdatetime.h>
#include <qmetatype.h>
#include <qregexp.h>
#if QT_CONFIG(regularexpression)
#include <qregularexpression.h>
#endif
#include <qshareddata.h>
#include <qsqlerror.h>
#include <qsqlfield.h>
@ -2335,9 +2337,11 @@ bool QOCIDriver::open(const QString & db,
} else {
QString versionStr;
versionStr = QString(reinterpret_cast<const QChar *>(vertxt));
QRegExp vers(QLatin1String("([0-9]+)\\.[0-9\\.]+[0-9]"));
if (vers.indexIn(versionStr) >= 0)
d->serverVersion = vers.cap(1).toInt();
#if QT_CONFIG(regularexpression)
auto match = QRegularExpression(QLatin1String("([0-9]+)\\.[0-9\\.]+[0-9]")).match(versionStr);
if (match.hasMatch())
d->serverVersion = vers.captured(1).toInt();
#endif
if (d->serverVersion == 0)
d->serverVersion = -1;
}