AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a couple of unused QStrings

Browse Source 
This is needed so we can add Q_WARN_UNUSED to QString.
The xcb one might even be a bug.

Change-Id: Ia2d2563bdd10aa747014410df4990597969f4634
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
This commit is contained in:
Sergio Martins 2018-11-29 13:23:00 +00:00 committed by Sérgio Martins
parent e25d7b1441
commit 19d7bd3d63
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/xcb/qxcbnativeinterface.cpp
View File

@ -304,7 +304,7 @@ QPlatformNativeInterface::NativeResourceForWindowFunction QXcbNativeInterface::n
QPlatformNativeInterface::NativeResourceForBackingStoreFunction QXcbNativeInterface::nativeResourceFunctionForBackingStore(const QByteArray &resource) QPlatformNativeInterface::NativeResourceForBackingStoreFunction QXcbNativeInterface::nativeResourceFunctionForBackingStore(const QByteArray &resource)
{ {
const QByteArray lowerCaseResource = resource.toLower(); const QByteArray lowerCaseResource = resource.toLower();
NativeResourceForBackingStoreFunction func = handlerNativeResourceFunctionForBackingStore(resource); NativeResourceForBackingStoreFunction func = handlerNativeResourceFunctionForBackingStore(lowerCaseResource);
return func; return func;
} }

2
src/plugins/sqldrivers/odbc/qsql_odbc.cpp
View File

@ -345,7 +345,7 @@ static QSqlError qMakeError(const QString& err, QSqlError::ErrorType type,
{ {
int nativeCode = -1; int nativeCode = -1;
QString message = qODBCWarn(p, &nativeCode); QString message = qODBCWarn(p, &nativeCode);
return QSqlError(QLatin1String("QODBC3: ") + err, qODBCWarn(p), type, return QSqlError(QLatin1String("QODBC3: ") + err, message, type,
nativeCode != -1 ? QString::number(nativeCode) : QString()); nativeCode != -1 ? QString::number(nativeCode) : QString());
} }