summaryrefslogtreecommitdiffstats
path: root/src/plugins/sqldrivers/ibase
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-03-01 01:00:23 +0100
committerSimon Hausmann <simon.hausmann@qt.io>2020-03-03 14:13:02 +0100
commit63312fe2ec1c1d8c0efabc02e3af8e5b47ca320e (patch)
treefc850de8f31581cc6a64db7a78d1cca479e20ce9 /src/plugins/sqldrivers/ibase
parent5ebb03c47604e0597502fbe1069de636987f33fc (diff)
parentfbebc93617d99d2bf8fed559f17dba8bed15a063 (diff)
Merge remote-tracking branch 'origin/5.15' into dev
Diffstat (limited to 'src/plugins/sqldrivers/ibase')
-rw-r--r--src/plugins/sqldrivers/ibase/qsql_ibase.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
index 09c0655f3d..fb364c21f5 100644
--- a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
+++ b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
@@ -1477,7 +1477,7 @@ bool QIBaseDriver::open(const QString & db,
if (isOpen())
close();
- const QStringList opts(connOpts.split(QLatin1Char(';'), QString::SkipEmptyParts));
+ const QStringList opts(connOpts.split(QLatin1Char(';'), Qt::SkipEmptyParts));
QString encString;
QByteArray role;