Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

2 files changed, 4 insertions, 1 deletions

diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp
index 821760f..193aa7c 100644
--- a/src/sql/kernel/qsqldatabase.cpp
+++ b/src/sql/kernel/qsqldatabase.cpp
@@ -455,6 +455,8 @@ void QSqlDatabasePrivate::disable()
     The database connection is referred to by \a connectionName. The
     newly added database connection is returned.
 
+    If \a type is not available or could not be loaded, isValid() returns false.
+
     If \a connectionName is not specified, the new connection becomes
     the default connection for the application, and subsequent calls
     to database() without the connection name argument will return the
diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp
index aebecf1..5f0a35d 100644
--- a/src/sql/models/qsqlrelationaltablemodel.cpp
+++ b/src/sql/models/qsqlrelationaltablemodel.cpp
@@ -569,7 +569,8 @@ QString QSqlRelationalTableModel::selectStatement() const
                 QString displayColumn = relation.displayColumn();
                 if (d->db.driver()->isIdentifierEscaped(displayColumn, QSqlDriver::FieldName))
                     displayColumn = d->db.driver()->stripDelimiters(displayColumn, QSqlDriver::FieldName);
-                fList.append(QString::fromLatin1(" AS %1_%2").arg(relTableName).arg(displayColumn));
+                fList.append(QString::fromLatin1(" AS %1_%2_%3").arg(relTableName).arg(displayColumn).arg(fieldNames.value(fieldList[i])));
+                fieldNames.insert(fieldList[i], fieldNames.value(fieldList[i])-1);
             }
 
             // this needs fixing!! the below if is borken.