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

5 files changed, 20 insertions, 9 deletions

diff --git a/doc/src/examples/ftp.qdoc b/doc/src/examples/ftp.qdoc
index 8fded88..782613c 100644
--- a/doc/src/examples/ftp.qdoc
+++ b/doc/src/examples/ftp.qdoc
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 /*!
-    \example network/ftp
+    \example network/qftp
     \title FTP Example
 
     The FTP example demonstrates a simple FTP client that can be used
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 05940e4..79cbe89 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -729,7 +729,7 @@
     \o  \l{network/network-chat}{Network Chat}
     \o  \l{network/fortuneclient}{Fortune Client}\raisedaster
     \o  \l{network/fortuneserver}{Fortune Server}\raisedaster
-    \o  \l{network/ftp}{FTP}\raisedaster
+    \o  \l{network/qftp}{FTP}\raisedaster
     \o  \l{network/http}{HTTP}
     \o  \l{network/loopback}{Loopback}
     \o  \l{network/threadedfortuneserver}{Threaded Fortune Server}\raisedaster
diff --git a/doc/src/network-programming/qtnetwork.qdoc b/doc/src/network-programming/qtnetwork.qdoc
index d9377fb..b44b84f 100644
--- a/doc/src/network-programming/qtnetwork.qdoc
+++ b/doc/src/network-programming/qtnetwork.qdoc
@@ -155,7 +155,7 @@
     commands based on the result of a previous command. It also
     enables you to provide detailed feedback to the user.
 
-    The \l{network/ftp}{FTP} example
+    The \l{network/qftp}{FTP} example
     illustrates how to write an FTP client.
     Writing your own FTP (or HTTP) server is possible using the
     lower-level classes QTcpSocket and QTcpServer.
diff --git a/src/gui/s60framework/qs60mainappui.cpp b/src/gui/s60framework/qs60mainappui.cpp
index 4ad78f9..4c4c994 100644
--- a/src/gui/s60framework/qs60mainappui.cpp
+++ b/src/gui/s60framework/qs60mainappui.cpp
@@ -163,7 +163,7 @@ void QS60MainAppUi::HandleResourceChangeL(TInt type)
 /*!
  * \brief Handles raw window server events.
  *
- * The event type and information is passed in \a event, while the receiving control is passed in
+ * The event type and information is passed in \a wsEvent, while the receiving control is passed in
  * \a destination.
  *
  * If you override this function, you should call the base class implementation if you do not
diff --git a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp
index 2508833..ca1502c 100644
--- a/src/sql/drivers/tds/qsql_tds.cpp
+++ b/src/sql/drivers/tds/qsql_tds.cpp
@@ -164,13 +164,13 @@ Q_GLOBAL_STATIC(QTDSErrorHash, errs)
 
 extern "C" {
 static int CS_PUBLIC qTdsMsgHandler (DBPROCESS* dbproc,
-                            DBINT /*msgno*/,
+                            DBINT msgno,
                             int msgstate,
                             int severity,
                             char* msgtext,
-                            char* /*srvname*/,
+                            char* srvname,
                             char* /*procname*/,
-                            int /*line*/)
+                            int line)
 {
     QTDSResultPrivate* p = errs()->value(dbproc);
 
@@ -181,9 +181,20 @@ static int CS_PUBLIC qTdsMsgHandler (DBPROCESS* dbproc,
     }
 
     if (severity > 0) {
-        QString errMsg = QString::fromLatin1("%1 (%2)").arg(QString::fromAscii(msgtext)).arg(
-                                    msgstate);
+        QString errMsg = QString::fromLatin1("%1 (Msg %2, Level %3, State %4, Server %5, Line %6)")
+                         .arg(QString::fromAscii(msgtext))
+                         .arg(msgno)
+                         .arg(severity)
+                         .arg(msgstate)
+                         .arg(QString::fromAscii(srvname))
+                         .arg(line);
         p->addErrorMsg(errMsg);
+        if (severity > 10) {
+            // Severe messages are really errors in the sense of lastError
+            errMsg = p->getErrorMsgs();
+            p->lastError = qMakeError(errMsg, QSqlError::UnknownError, msgno);
+            p->clearErrorMsgs();
+        }
     }
 
     return INT_CANCEL;