diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2022-10-13 20:11:04 +0200 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2022-10-14 20:34:44 +0000 |
| commit | c3dccfef22267c2f78438973a39bc91260d96582 (patch) | |
| tree | 0860ad64601df20f5b0225aed2e4f54115e2cc96 /src/plugins | |
| parent | c017ef8bda3a9b41363df50ac24361c6020b02ec (diff) | |
SQL/OCI: fix compilation
Fix compilation error introduced with
917b4d3802f3c2102021610cbf977403a3d4c21a and add a missing override
Pick-to: 6.4
Fixes: QTBUG-107544
Change-Id: I53571a0a113dc0f1e65f8773e66c02c1764739ee
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/sqldrivers/oci/main.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/oci/qsql_oci.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/sqldrivers/oci/main.cpp b/src/plugins/sqldrivers/oci/main.cpp index 933de8f8bf..6cc0062671 100644 --- a/src/plugins/sqldrivers/oci/main.cpp +++ b/src/plugins/sqldrivers/oci/main.cpp @@ -17,7 +17,7 @@ class QOCIDriverPlugin : public QSqlDriverPlugin public: QOCIDriverPlugin(); - QSqlDriver* create(const QString &); + QSqlDriver* create(const QString &) override; }; QOCIDriverPlugin::QOCIDriverPlugin() diff --git a/src/plugins/sqldrivers/oci/qsql_oci.cpp b/src/plugins/sqldrivers/oci/qsql_oci.cpp index 9d2e243001..c33e7582ba 100644 --- a/src/plugins/sqldrivers/oci/qsql_oci.cpp +++ b/src/plugins/sqldrivers/oci/qsql_oci.cpp @@ -426,6 +426,7 @@ int QOCIResultPrivate::bindValue(OCIStmt *sql, OCIBind **hbnd, OCIError *err, in break; } } // fall through for OUT values + Q_FALLTHROUGH(); default: { if (val.typeId() >= QMetaType::User) { if (val.canConvert<QOCIRowIdPointer>() && !isOutValue(pos)) { @@ -2434,7 +2435,7 @@ static QString make_where_clause(const QString &user, Expression e) "WMSYS", }; static const char joinC[][4] = { "or" , "and" }; - static constexpr QLatin1Char bang[] = { u' ', u'!' }; + static constexpr char16_t bang[] = { u' ', u'!' }; const QLatin1StringView join(joinC[e]); |