diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/Qt5CTestMacros.cmake | 13 | ||||
| -rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.cpp | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/corelib/Qt5CTestMacros.cmake b/src/corelib/Qt5CTestMacros.cmake index b313cd5c08..297a9e07f6 100644 --- a/src/corelib/Qt5CTestMacros.cmake +++ b/src/corelib/Qt5CTestMacros.cmake @@ -134,18 +134,23 @@ function(test_module_includes) set(instances_string "") while(all_args) list(GET all_args 0 qtmodule) - list(GET all_args 1 qtinclude) + list(GET all_args 1 qtclass) + if (${qtclass}_NAMESPACE) + set(qtinstancetype ${${qtclass}_NAMESPACE}::${qtclass}) + else() + set(qtinstancetype ${qtclass}) + endif() list(REMOVE_AT all_args 0 1) set(includes_string "${includes_string} - #include <${qtinclude}> - #include <Qt${qtmodule}/${qtinclude}> + #include <${qtclass}> + #include <Qt${qtmodule}/${qtclass}> #include <Qt${qtmodule}> #include <Qt${qtmodule}/Qt${qtmodule}>" ) set(instances_string "${instances_string} - ${qtinclude} local${qtinclude}; + ${qtinstancetype} local${qtclass}; ") endwhile() diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index f0f1f64141..56c38774ec 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -1592,7 +1592,7 @@ bool QODBCResult::exec() } } r = SQLExecute(d->hStmt); - if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO) { + if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO && r != SQL_NO_DATA) { qWarning() << "QODBCResult::exec: Unable to execute statement:" << qODBCWarn(d); setLastError(qMakeError(QCoreApplication::translate("QODBCResult", "Unable to execute statement"), QSqlError::StatementError, d)); |