diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-04 03:43:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-04 03:43:47 (GMT) |
| commit | 1448e19b3613ab7c5498c17c619586d03ec46d18 (patch) | |
| tree | a6ce8079bf05a0692c3370c7fc88887711edd7a2 /src/sql | |
| parent | 58c591974bf34577e27638f1328a04c4f7c698f8 (diff) | |
| parent | a039a3a53d0a07b04e3b30ba2a73150ea5d2522a (diff) | |
| download | Qt-1448e19b3613ab7c5498c17c619586d03ec46d18.zip Qt-1448e19b3613ab7c5498c17c619586d03ec46d18.tar.gz Qt-1448e19b3613ab7c5498c17c619586d03ec46d18.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
tst_qgraphicsitem: stabilize on X11
Added OpenGL 3.3 and 4.0 recognition to QGLFormat
Fix compilation: disable -no-feature-* for bootstrapped
QString: Fix severals bugs when comparing with QStringRef
QProgressBar: make accessors const.
Changes: add patch for artificial emboldening
Added static version of QGLFramebufferObject::release().
Fix compilation on WinXP MinGW32;
Add a new qconfig feature GESTURES
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index 6fd1725..9a35ac5 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -259,14 +259,14 @@ static QString qWarnODBCHandle(int handleType, SQLHANDLE handle, int *nativeCode static QString qODBCWarn(const QODBCPrivate* odbc, int *nativeCode = 0) { - return (qWarnODBCHandle(SQL_HANDLE_ENV, odbc->dpEnv()) + QLatin1Char(' ') + return QString(qWarnODBCHandle(SQL_HANDLE_ENV, odbc->dpEnv()) + QLatin1Char(' ') + qWarnODBCHandle(SQL_HANDLE_DBC, odbc->dpDbc()) + QLatin1Char(' ') + qWarnODBCHandle(SQL_HANDLE_STMT, odbc->hStmt, nativeCode)).simplified(); } static QString qODBCWarn(const QODBCDriverPrivate* odbc, int *nativeCode = 0) { - return (qWarnODBCHandle(SQL_HANDLE_ENV, odbc->hEnv) + QLatin1Char(' ') + return QString(qWarnODBCHandle(SQL_HANDLE_ENV, odbc->hEnv) + QLatin1Char(' ') + qWarnODBCHandle(SQL_HANDLE_DBC, odbc->hDbc, nativeCode)).simplified(); } |