Merge remote-tracking branch 'gerrit/dev' into HEAD

2 files changed, 6 insertions, 9 deletions

diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
index 0bea9ebfa1..7cfa554418 100644
--- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
@@ -699,10 +699,8 @@ QVariant QMYSQLResult::data(int field)
         }
         if(ok)
             return v;
-        else
-            return QVariant();
+        return QVariant();
     }
-        return QVariant(val.toDouble());
     case QVariant::Date:
         return qDateFromString(val);
     case QVariant::Time:
@@ -719,12 +717,11 @@ QVariant QMYSQLResult::data(int field)
         }
         return QVariant(ba);
     }
-    default:
     case QVariant::String:
+    default:
         return QVariant(val);
     }
-    qWarning("QMYSQLResult::data: unknown data type");
-    return QVariant();
+    Q_UNREACHABLE();
 }
 
 bool QMYSQLResult::isNull(int field)
diff --git a/src/plugins/sqldrivers/oci/qsql_oci.cpp b/src/plugins/sqldrivers/oci/qsql_oci.cpp
index 47d6db7ea4..32d3681a17 100644
--- a/src/plugins/sqldrivers/oci/qsql_oci.cpp
+++ b/src/plugins/sqldrivers/oci/qsql_oci.cpp
@@ -2405,16 +2405,16 @@ static QString make_where_clause(const QString &user, Expression e)
     static const char joinC[][4] = { "or" , "and" };
     static Q_CONSTEXPR QLatin1Char bang[] = { QLatin1Char(' '), QLatin1Char('!') };
 
-    const QLatin1String join(joinC[e], -1); // -1: force strlen call
+    const QLatin1String join(joinC[e]);
 
     QString result;
     result.reserve(sizeof sysUsers / sizeof *sysUsers *
                    // max-sizeof(owner != <sysuser> and )
                                 (9 + sizeof *sysUsers + 5));
     for (const auto &sysUser : sysUsers) {
-        const QLatin1String l1(sysUser, -1); // -1: force strlen call
+        const QLatin1String l1(sysUser);
         if (l1 != user)
-            result += QLatin1String("owner ") + bang[e] + QLatin1String("= '") + l1 + QLatin1Char(' ') + join + QLatin1Char(' ');
+            result += QLatin1String("owner ") + bang[e] + QLatin1String("= '") + l1 + QLatin1String("' ") + join + QLatin1Char(' ');
     }
 
     result.chop(join.size() + 2); // remove final " <join> "