diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-05-18 12:56:44 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-05-18 12:56:44 (GMT) |
| commit | 181dc3984ddf1445d85d085f82c7d14f2fc08519 (patch) | |
| tree | 6c728d05d54ae91548fa7493682faa3c4c4fc662 /src/sql/drivers/ibase | |
| parent | 37930d767ad67912b58332a87b6b6efc942a3082 (diff) | |
| parent | 6e81bfbaf69864a06240835e0b30cdc47a2668b7 (diff) | |
| download | Qt-181dc3984ddf1445d85d085f82c7d14f2fc08519.zip Qt-181dc3984ddf1445d85d085f82c7d14f2fc08519.tar.gz Qt-181dc3984ddf1445d85d085f82c7d14f2fc08519.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/sql/drivers/ibase')
| -rw-r--r-- | src/sql/drivers/ibase/qsql_ibase.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/sql/drivers/ibase/qsql_ibase.cpp b/src/sql/drivers/ibase/qsql_ibase.cpp index 6834d9a..4f3d79d 100644 --- a/src/sql/drivers/ibase/qsql_ibase.cpp +++ b/src/sql/drivers/ibase/qsql_ibase.cpp @@ -66,8 +66,11 @@ QT_BEGIN_NAMESPACE enum { QIBaseChunkSize = SHRT_MAX / 2 }; -static bool getIBaseError(QString& msg, ISC_STATUS* status, ISC_LONG &sqlcode, - QTextCodec *tc) +#if defined(FB_API_VER) && FB_API_VER >= 20 +static bool getIBaseError(QString& msg, const ISC_STATUS* status, ISC_LONG &sqlcode, QTextCodec *tc) +#else +static bool getIBaseError(QString& msg, ISC_STATUS* status, ISC_LONG &sqlcode, QTextCodec *tc) +#endif { if (status[0] != 1 || status[1] <= 0) return false; @@ -75,7 +78,11 @@ static bool getIBaseError(QString& msg, ISC_STATUS* status, ISC_LONG &sqlcode, msg.clear(); sqlcode = isc_sqlcode(status); char buf[512]; +#if defined(FB_API_VER) && FB_API_VER >= 20 + while(fb_interpret(buf, 512, &status)) { +#else while(isc_interprete(buf, &status)) { +#endif if(!msg.isEmpty()) msg += QLatin1String(" - "); if (tc) |