diff options
| author | lit-uriy <lit-uriy@yandex.ru> | 2010-06-02 08:36:43 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2010-06-02 08:36:43 (GMT) |
| commit | dad9f0db9dbde73aeaccc4f5d27def15066cd618 (patch) | |
| tree | 87247173600df4aa686d7a49c5cf8d2f762a922a /src/sql | |
| parent | f62926954a742990a33a54ad598de1af0989d92b (diff) | |
| download | Qt-dad9f0db9dbde73aeaccc4f5d27def15066cd618.zip Qt-dad9f0db9dbde73aeaccc4f5d27def15066cd618.tar.gz Qt-dad9f0db9dbde73aeaccc4f5d27def15066cd618.tar.bz2 | |
Fix compilation on WinXP MinGW32;
Without this change, I get an error when building plug QODBC:
drivers\odbc\qsql_odbc.cpp: In function 'QString qODBCWarn(const QODBCPrivate*, int*)':
drivers\odbc\qsql_odbc.cpp:264: error: 'class QStringBuilder<QStringBuilder<QStringBuilder<QStringBuilder<QString, QLatin1Char>, QString>, QLatin1Char>, QString>' has no member named 'simplified'
drivers\odbc\qsql_odbc.cpp: In function 'QString qODBCWarn(const QODBCDriverPrivate*, int*)':
drivers\odbc\qsql_odbc.cpp:270: error: 'class QStringBuilder<QStringBuilder<QString, QLatin1Char>, QString>' has no member named 'simplified'
drivers\odbc\qsql_odbc.cpp: In function 'QString qGetStringData(void*, int, int, bool)':
drivers\odbc\qsql_odbc.cpp:403: warning: comparison between signed and unsigned integer expressions
drivers\odbc\qsql_odbc.cpp:444: warning: comparison between signed and unsigned integer expressions
Env:
Windows XP SP2
MinGW (GCC 4.4.0 from trolls ftp)
Merge-request: 2402
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
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(); } |