From c3dccfef22267c2f78438973a39bc91260d96582 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Date: Thu, 13 Oct 2022 20:11:04 +0200
Subject: [PATCH] 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>
---
 src/plugins/sqldrivers/oci/main.cpp     | 2 +-
 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]);