diff options
Diffstat (limited to 'src/plugins/sqldrivers/oci')
-rw-r--r-- | src/plugins/sqldrivers/oci/qsql_oci.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/plugins/sqldrivers/oci/qsql_oci.cpp b/src/plugins/sqldrivers/oci/qsql_oci.cpp index 8da9837a59..66ee890734 100644 --- a/src/plugins/sqldrivers/oci/qsql_oci.cpp +++ b/src/plugins/sqldrivers/oci/qsql_oci.cpp @@ -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; } |