diff options
| author | Fathi Boudra <fabo@debian.org> | 2009-02-20 20:24:25 +0000 |
|---|---|---|
| committer | Fathi Boudra <fabo@debian.org> | 2009-02-20 20:24:25 +0000 |
| commit | 7b37d1bc4f6b27188b0688dcdc2b89db3101575c (patch) | |
| tree | dccc02bc71441fbb202d0bfd622af264fc33c89f /debian/patches/17_add_postgresql_8.3_support.diff | |
| parent | 6ad728b38295ae6479662a58b8c640f389bfa607 (diff) | |
| download | qt4-x11-1ed1998e0b4e9ce63e47de6c12088eacc40ed46c.tar.gz | |
Merge Qt4 4.5 branch to trunk.debian/4.5.0-rc1-1
Diffstat (limited to 'debian/patches/17_add_postgresql_8.3_support.diff')
| -rw-r--r-- | debian/patches/17_add_postgresql_8.3_support.diff | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches/17_add_postgresql_8.3_support.diff b/debian/patches/17_add_postgresql_8.3_support.diff index 7edc391..889ad50 100644 --- a/debian/patches/17_add_postgresql_8.3_support.diff +++ b/debian/patches/17_add_postgresql_8.3_support.diff @@ -2,7 +2,7 @@ Enable PostgreSQL 8.3 support. --- a/src/sql/drivers/psql/qsql_psql.cpp +++ b/src/sql/drivers/psql/qsql_psql.cpp -@@ -633,9 +633,12 @@ static QPSQLDriver::Protocol getPSQLVers +@@ -632,9 +632,12 @@ static QPSQLDriver::Protocol getPSQLVers serverVersion = QPSQLDriver::Version81; break; case 2: @@ -16,7 +16,7 @@ Enable PostgreSQL 8.3 support. } break; default: -@@ -916,6 +919,7 @@ QSqlIndex QPSQLDriver::primaryIndex(cons +@@ -915,6 +918,7 @@ QSqlIndex QPSQLDriver::primaryIndex(cons case QPSQLDriver::Version8: case QPSQLDriver::Version81: case QPSQLDriver::Version82: @@ -24,7 +24,7 @@ Enable PostgreSQL 8.3 support. stmt = QLatin1String("SELECT pg_attribute.attname, pg_attribute.atttypid::int, " "pg_class.relname " "FROM pg_attribute, pg_class " -@@ -989,6 +993,7 @@ QSqlRecord QPSQLDriver::record(const QSt +@@ -988,6 +992,7 @@ QSqlRecord QPSQLDriver::record(const QSt case QPSQLDriver::Version8: case QPSQLDriver::Version81: case QPSQLDriver::Version82: @@ -34,7 +34,7 @@ Enable PostgreSQL 8.3 support. "pg_attrdef.adsrc " --- a/src/sql/drivers/psql/qsql_psql.h +++ b/src/sql/drivers/psql/qsql_psql.h -@@ -100,7 +100,8 @@ public: +@@ -99,7 +99,8 @@ public: Version74 = 10, Version8 = 11, Version81 = 12, |