From 8247ce9766594cc740bb15415b162ec7f1b00f6a Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 9 Jan 2018 17:17:57 +0100 Subject: SQL plugins: Fix warnings about deprecated constructor of QSqlError Use the constructor taking a string and convert number unless it is -1. Change-Id: I18d1ba2c8e0d3f4af01b7955863967f75051746b Reviewed-by: Andy Shaw --- src/plugins/sqldrivers/odbc/qsql_odbc.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/plugins/sqldrivers/odbc/qsql_odbc.cpp') diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp index 4a4183c7a3..547eb2043d 100644 --- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp +++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp @@ -335,7 +335,8 @@ static QSqlError qMakeError(const QString& err, QSqlError::ErrorType type, const { int nativeCode = -1; QString message = qODBCWarn(p, &nativeCode); - return QSqlError(QLatin1String("QODBC3: ") + err, message, type, nativeCode); + return QSqlError(QLatin1String("QODBC3: ") + err, message, type, + nativeCode != -1 ? QString::number(nativeCode) : QString()); } static QSqlError qMakeError(const QString& err, QSqlError::ErrorType type, @@ -343,7 +344,8 @@ static QSqlError qMakeError(const QString& err, QSqlError::ErrorType type, { int nativeCode = -1; QString message = qODBCWarn(p, &nativeCode); - return QSqlError(QLatin1String("QODBC3: ") + err, qODBCWarn(p), type, nativeCode); + return QSqlError(QLatin1String("QODBC3: ") + err, qODBCWarn(p), type, + nativeCode != -1 ? QString::number(nativeCode) : QString()); } static QVariant::Type qDecodeODBCType(SQLSMALLINT sqltype, bool isSigned = true) -- cgit v1.2.3