Merge commit 'origin/master' into 4.6-merged

Conflicts:
	src/corelib/kernel/qcoreevent.cpp
	src/corelib/tools/qdumper.cpp
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget_p.h
	src/gui/kernel/qwidget_s60.cpp
	src/gui/text/qfontdatabase.cpp
	src/network/access/qnetworkreplyimpl.cpp
	src/sql/drivers/ibase/qsql_ibase.cpp
	src/testlib/qtestcase.cpp
	src/testlib/testlib.pro
	tests/auto/network-settings.h
	tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
	tests/auto/qobjectrace/tst_qobjectrace.cpp
	tests/auto/qsqldatabase/tst_qsqldatabase.cpp
	tools/configure/configureapp.cpp
	translations/qt_ru.ts

13 files changed, 299 insertions, 60 deletions

diff --git a/examples/graphicsview/padnavigator/panel.h b/examples/graphicsview/padnavigator/panel.h
index 3d17b42..aebf7b0 100644
--- a/examples/graphicsview/padnavigator/panel.h
+++ b/examples/graphicsview/padnavigator/panel.h
@@ -44,7 +44,7 @@
 QT_BEGIN_NAMESPACE
 class QTimeLine;
 class Ui_BackSide;
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class RoundRectItem;
 
diff --git a/examples/graphicsview/padnavigator/roundrectitem.h b/examples/graphicsview/padnavigator/roundrectitem.h
index 5ff437c..21b3ba4 100644
--- a/examples/graphicsview/padnavigator/roundrectitem.h
+++ b/examples/graphicsview/padnavigator/roundrectitem.h
@@ -46,7 +46,7 @@
 
 QT_BEGIN_NAMESPACE
 class QGraphicsProxyWidget;
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class RoundRectItem : public QObject, public QGraphicsRectItem
 {
diff --git a/examples/network/fortuneclient/client.cpp b/examples/network/fortuneclient/client.cpp
index f3947e2..9828d86 100644
--- a/examples/network/fortuneclient/client.cpp
+++ b/examples/network/fortuneclient/client.cpp
@@ -44,6 +44,10 @@
 
 #include "client.h"
 
+#ifdef Q_OS_SYMBIAN
+#include "sym_iap_util.h"
+#endif
+
 //! [0]
 Client::Client(QWidget *parent)
     : QDialog(parent)
@@ -102,6 +106,10 @@ Client::Client(QWidget *parent)
 
     setWindowTitle(tr("Fortune Client"));
     portLineEdit->setFocus();
+
+#ifdef Q_OS_SYMBIAN
+    isDefaultIapSet = false;
+#endif
 //! [5]
 }
 //! [5]
@@ -110,6 +118,12 @@ Client::Client(QWidget *parent)
 void Client::requestNewFortune()
 {
     getFortuneButton->setEnabled(false);
+#ifdef Q_OS_SYMBIAN
+    if(!isDefaultIapSet) {
+        qt_SetDefaultIap();
+        isDefaultIapSet = true;
+    }
+#endif
     blockSize = 0;
     tcpSocket->abort();
 //! [7]
diff --git a/examples/network/fortuneclient/client.h b/examples/network/fortuneclient/client.h
index c8b8b26..714d871 100644
--- a/examples/network/fortuneclient/client.h
+++ b/examples/network/fortuneclient/client.h
@@ -80,6 +80,9 @@ private:
     QTcpSocket *tcpSocket;
     QString currentFortune;
     quint16 blockSize;
+#ifdef Q_OS_SYMBIAN
+    bool isDefaultIapSet;
+#endif
 };
 //! [0]
 
diff --git a/examples/network/fortuneclient/fortuneclient.pro b/examples/network/fortuneclient/fortuneclient.pro
index bb125e8..4765208 100644
--- a/examples/network/fortuneclient/fortuneclient.pro
+++ b/examples/network/fortuneclient/fortuneclient.pro
@@ -10,3 +10,10 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/network/fortuneclient
 INSTALLS += target sources
 
 include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian {
+    HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h
+    LIBS += -lesock
+    TARGET.CAPABILITY = "NetworkServices ReadUserData WriteUserData"
+    TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
+}
diff --git a/examples/network/fortuneclient/main.cpp b/examples/network/fortuneclient/main.cpp
index 0cc7378..4db555c 100644
--- a/examples/network/fortuneclient/main.cpp
+++ b/examples/network/fortuneclient/main.cpp
@@ -40,13 +40,17 @@
 ****************************************************************************/
 
 #include <QApplication>
-
 #include "client.h"
 
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
     Client client;
+#ifdef Q_OS_SYMBIAN
+    // Make application better looking and more usable on small screen
+    client.showMaximized();
+#else
     client.show();
+#endif
     return client.exec();
 }
diff --git a/examples/network/fortuneserver/fortuneserver.pro b/examples/network/fortuneserver/fortuneserver.pro
index 8cf52ee..ea37b58 100644
--- a/examples/network/fortuneserver/fortuneserver.pro
+++ b/examples/network/fortuneserver/fortuneserver.pro
@@ -10,3 +10,11 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/network/fortuneserver
 INSTALLS += target sources
 
 include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian {
+    HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h
+    LIBS += -lesock
+    TARGET.UID3 = 0xA000CF71
+    TARGET.CAPABILITY = "All -TCB"
+    TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
+}
\ No newline at end of file
diff --git a/examples/network/fortuneserver/main.cpp b/examples/network/fortuneserver/main.cpp
index d742fb1..3394c1c 100644
--- a/examples/network/fortuneserver/main.cpp
+++ b/examples/network/fortuneserver/main.cpp
@@ -46,11 +46,22 @@
 
 #include "server.h"
 
+#ifdef Q_OS_SYMBIAN
+#include "sym_iap_util.h"
+#endif
+
 int main(int argc, char *argv[])
 {
+#ifdef Q_OS_SYMBIAN
+    qt_SetDefaultIap();
+#endif
     QApplication app(argc, argv);
     Server server;
+#ifdef Q_OS_SYMBIAN
+    server.showMaximized();
+#else
     server.show();
+#endif
     qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
     return server.exec();
 }
diff --git a/examples/network/fortuneserver/server.cpp b/examples/network/fortuneserver/server.cpp
index a102ef2..5da43ab 100644
--- a/examples/network/fortuneserver/server.cpp
+++ b/examples/network/fortuneserver/server.cpp
@@ -63,10 +63,15 @@ Server::Server(QWidget *parent)
         return;
     }
 //! [0]
+    QList<QHostAddress> ipAddresseList = QNetworkInterface::allAddresses();
+    QString ipAddresses;
+    for (int i = 0; i < ipAddresseList.size(); ++i) {
+        ipAddresses.append(ipAddresseList.at(i).toString()).append("\n");
+    }
 
-    statusLabel->setText(tr("The server is running on port %1.\n"
+    statusLabel->setText(tr("The server is running on \n IP: \n%1 PORT: \n%2\n"
                             "Run the Fortune Client example now.")
-                         .arg(tcpServer->serverPort()));
+                         .arg(ipAddresses).arg(tcpServer->serverPort()));
 //! [1]
 
 //! [2]
diff --git a/examples/network/ftp/ftp.pro b/examples/network/ftp/ftp.pro
index c70b812..ac3d3e6 100644
--- a/examples/network/ftp/ftp.pro
+++ b/examples/network/ftp/ftp.pro
@@ -15,7 +15,7 @@ include($$QT_SOURCE_TREE/examples/examplebase.pri)
 symbian {
     HEADERS +=  sym_iap_util.h
     INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
-    TARGET.CAPABILITY="NetworkServices"
+    TARGET.CAPABILITY="NetworkServices ReadUserData WriteUserData"
     TARGET.UID3 = 0xA000A648
-    LIBS+=-lesock -lconnmon   # For IAP selection
+    LIBS+=-lesock -lcommdb # For IAP selection
 }
\ No newline at end of file
diff --git a/examples/network/ftp/sym_iap_util.h b/examples/network/ftp/sym_iap_util.h
index 14df5af..6d52b1d 100644
--- a/examples/network/ftp/sym_iap_util.h
+++ b/examples/network/ftp/sym_iap_util.h
@@ -41,10 +41,67 @@
 #ifndef QSYM_IAP_UTIL_H
 #define QSYM_IAP_UTIL_H
 
+// Symbian
 #include <es_sock.h>
+#include <es_enum.h>
+#include <commdbconnpref.h>
+
+// OpenC
 #include <sys/socket.h>
 #include <net/if.h>
-#include <rconnmon.h>
+
+//Qt
+#include <QSettings>
+#include <QStringList>
+
+_LIT(KIapNameSetting, "IAP\\Name");             // text - mandatory
+_LIT(KIapDialogPref, "IAP\\DialogPref");        // TUnit32 - optional
+_LIT(KIapService, "IAP\\IAPService");           // TUnit32 - mandatory
+_LIT(KIapServiceType, "IAP\\IAPServiceType");   // text - mandatory
+_LIT(KIapBearer, "IAP\\IAPBearer");             // TUint32 - optional
+_LIT(KIapBearerType, "IAP\\IAPBearerType");     // text - optional
+_LIT(KIapNetwork, "IAP\\IAPNetwork");           // TUint32 - optional
+
+const QLatin1String qtOrganizationTag("Trolltech");
+const QLatin1String qtNetworkModuleTag("QtNetwork");
+const QLatin1String iapGroupTag("IAP");
+const QLatin1String iapNamesArrayTag("Names");
+const QLatin1String iapNameItemTag("Name");
+
+void clearIapNamesSettings(QSettings &settings) {
+    settings.beginGroup(qtNetworkModuleTag);
+        settings.beginGroup(iapGroupTag);
+           settings.remove(iapNamesArrayTag);
+        settings.endGroup();
+    settings.endGroup();
+}
+
+void writeIapNamesSettings(QSettings &settings, const QStringList& iapNames) {
+    clearIapNamesSettings(settings);
+    settings.beginGroup(qtNetworkModuleTag);
+        settings.beginGroup(iapGroupTag);
+            settings.beginWriteArray(iapNamesArrayTag);
+            for (int index = 0; index < iapNames.size(); ++index) {
+                settings.setArrayIndex(index);
+                settings.setValue(iapNameItemTag, iapNames.at(index));
+            }
+            settings.endArray();
+        settings.endGroup();
+    settings.endGroup();
+}
+
+void readIapNamesSettings(QSettings &settings, QStringList& iapNames) {
+    settings.beginGroup(qtNetworkModuleTag);
+        settings.beginGroup(iapGroupTag);
+            int last = settings.beginReadArray(iapNamesArrayTag);
+            for (int index = 0; index < last; ++index) {
+                settings.setArrayIndex(index);
+                iapNames.append(settings.value(iapNameItemTag).toString());
+            }
+            settings.endArray();
+        settings.endGroup();
+    settings.endGroup();
+}
 
 QString qt_TDesC2QStringL(const TDesC& aDescriptor) 
 {
@@ -55,11 +112,95 @@ QString qt_TDesC2QStringL(const TDesC& aDescriptor)
 #endif
 }
 
-static void qt_SetDefaultIapL() 
-{
+static bool qt_SetDefaultIapName(const QString &iapName, int &error) {
+    struct ifreq ifReq;
+    // clear structure
+    memset(&ifReq, 0, sizeof(struct ifreq));
+    // set IAP name value
+    // make sure it is in UTF8
+    strcpy(ifReq.ifr_name, iapName.toUtf8().data());
+
+    if(setdefaultif(&ifReq) == 0) {
+        // OK
+        error = 0;
+        return true;
+    } else {
+        error = errno;
+        return false;
+    }
+
+}
+static bool qt_SetDefaultSnapId(const int snapId, int &error) {
+    struct ifreq ifReq;
+    // clear structure
+    memset(&ifReq, 0, sizeof(struct ifreq));
+    // set SNAP ID value
+    ifReq.ifr_ifru.snap_id = snapId;
+
+    if(setdefaultif(&ifReq) == 0) {
+        // OK
+        error = 0;
+        return true;
+    } else {
+        error = errno;
+        return false;
+    }
+
+}
+
+static void qt_SaveIapName(QSettings& settings, QStringList& iapNames, QString& iapNameValue) {
+    if(iapNames.contains(iapNameValue) && iapNames.first() == iapNameValue) {
+        // no need to update
+    } else {
+        if(iapNameValue != QString("Easy WLAN")) {
+            // new selection alway on top
+            iapNames.removeAll(iapNameValue);
+            iapNames.prepend(iapNameValue);
+            writeIapNamesSettings(settings, iapNames);
+        } else {
+            // Unbeliveable ... if IAP dodn't exist before
+            // no matter what you choose from IAP selection list
+            // you will get "Easy WLAN" as IAP name value
+
+            // somehow commsdb is not in sync
+        }
+    }
+}
+
+static QString qt_OfferIapDialog() {
+    TBuf8<256> iapName;
+
+    RSocketServ socketServ;
+    CleanupClosePushL(socketServ);
+
+    RConnection connection;
+    CleanupClosePushL(connection);
+
+    socketServ.Connect();
+    connection.Open(socketServ);
+    connection.Start();
+
+    connection.GetDesSetting(TPtrC(KIapNameSetting), iapName);
+
+    //connection.Stop();
+
+    iapName.ZeroTerminate();
+    QString strIapName((char*)iapName.Ptr());
+
+    int error = 0;
+    if(!qt_SetDefaultIapName(strIapName, error)) {
+        //printf("failed setdefaultif @ %i with %s and errno = %d \n", __LINE__, strIapName.toUtf8().data(), error);
+        strIapName = QString("");
+    }
+
+    CleanupStack::PopAndDestroy(&connection);
+    CleanupStack::PopAndDestroy(&socketServ);
+
+    return strIapName;
+}
+
+static QString qt_CheckForActiveConnection() {
     TUint count;
-    TRequestStatus status;
-    TUint ids[15];
 
     RSocketServ serv;
     CleanupClosePushL(serv);
@@ -67,59 +208,105 @@ static void qt_SetDefaultIapL()
     RConnection conn;
     CleanupClosePushL(conn);
 
-    RConnectionMonitor monitor;
-    CleanupClosePushL(monitor);
+    serv.Connect();
+    conn.Open(serv);
 
-    monitor.ConnectL();
-    monitor.GetConnectionCount(count, status);
-    User::WaitForRequest(status);
-    if(status.Int() != KErrNone) {
-        User::Leave(status.Int());
-    }
+    TConnectionInfoBuf connInfo;
 
-    TUint numSubConnections;
+    TBuf8<256> iapName;
+    TBuf8<256> iapServiceType;
 
-    if(count > 0) {
-        for (TInt i = 1; i <= count; i++) {
-            User::LeaveIfError(monitor.GetConnectionInfo(i, ids[i-1], numSubConnections));
-        }
-        /*
-         * get IAP value for first active connection
-         */
-        TBuf< 50 > iapName;
-        monitor.GetStringAttribute(ids[0], 0, KIAPName, iapName, status);
-        User::WaitForRequest(status);
-        if (status.Int() != KErrNone) {
-            User::Leave(status.Int());
-        } else {
-            QString strIapName = qt_TDesC2QStringL(iapName);
-            struct ifreq ifReq;
-            strcpy(ifReq.ifr_name, strIapName.toLatin1().data());
-            User::LeaveIfError(setdefaultif(&ifReq));
+    QString strIapName;
+
+    if (conn.EnumerateConnections(count) == KErrNone) {
+        if(count > 0) {
+            for (TUint i = 1; i <= count; i++) {
+                if (conn.GetConnectionInfo(i, connInfo) == KErrNone) {
+                    RConnection tempConn;
+                    CleanupClosePushL(tempConn);
+                    tempConn.Open(serv);
+                    if (tempConn.Attach(connInfo, RConnection::EAttachTypeNormal) == KErrNone) {
+                       tempConn.GetDesSetting(TPtrC(KIapNameSetting), iapName);
+                       tempConn.GetDesSetting(TPtrC(KIapServiceType), iapServiceType);
+                       //tempConn.Stop();
+                       iapName.ZeroTerminate();
+		       iapServiceType.ZeroTerminate();
+
+//                        if(iapServiceType.Find(_L8("LANService")) != KErrNotFound) {
+//                            activeLanConnectionFound = ETrue;
+//                            break;
+//                        }
+			strIapName = QString((char*)iapName.Ptr());
+                        int error = 0;
+                        if(!qt_SetDefaultIapName(strIapName, error)) {
+                            //printf("failed setdefaultif @ %i with %s and errno = %d \n", __LINE__, strIapName.toUtf8().data(), error);
+                            strIapName = QString("");
+                        }
+
+                        CleanupStack::PopAndDestroy(&tempConn);
+                        break;
+                    }
+                }
+            }
         }
-    } else {
-        /*
-         * no active connections yet
-         * use IAP dialog to select one
-         */
-        User::LeaveIfError(serv.Connect());
-        User::LeaveIfError(conn.Open(serv));
-        User::LeaveIfError(conn.Start());
-
-        _LIT(KIapNameSetting, "IAP\\Name");
-        TBuf8<50> iap8Name;
-        User::LeaveIfError(conn.GetDesSetting(TPtrC(KIapNameSetting), iap8Name));
-        iap8Name.ZeroTerminate();
-
-        conn.Stop();
-
-        struct ifreq ifReq;
-        strcpy(ifReq.ifr_name, (char*)iap8Name.Ptr());
-        User::LeaveIfError(setdefaultif(&ifReq));
     }
-    CleanupStack::PopAndDestroy(&monitor);
+
+    //conn.Stop();
+
     CleanupStack::PopAndDestroy(&conn);
     CleanupStack::PopAndDestroy(&serv);
+
+    return strIapName;
+}
+
+static QString qt_CheckSettingsForConnection(QStringList& iapNames) {
+    QString strIapName;
+    for(int index = 0; index < iapNames.size(); ++index) {
+        strIapName = iapNames.at(index);
+        int error = 0;
+        if(!qt_SetDefaultIapName(strIapName, error)) {
+            //printf("failed setdefaultif @ %i with %s and errno = %d \n", __LINE__, strIapName.toUtf8().data(), error);
+            strIapName = QString("");
+        } else {
+            return strIapName;
+        }
+    }
+    return strIapName;
+}
+
+static void qt_SetDefaultIapL()
+{
+    // settings @ /c/data/.config/Trolltech.com
+    QSettings settings(QSettings::UserScope, qtOrganizationTag);
+    // populate iap name list
+    QStringList iapNames;
+    readIapNamesSettings(settings, iapNames);
+
+    QString iapNameValue;
+
+    iapNameValue = qt_CheckForActiveConnection();
+
+    if(!iapNameValue.isEmpty()) {
+        qt_SaveIapName(settings, iapNames, iapNameValue);
+        return;
+    }
+
+    iapNameValue = qt_CheckSettingsForConnection(iapNames);
+
+    if(!iapNameValue.isEmpty()) {
+        qt_SaveIapName(settings, iapNames, iapNameValue);
+        return;
+    }
+
+    /*
+     * no active LAN connections yet
+     * no IAP in settings
+     * offer IAP dialog to user
+     */
+    iapNameValue = qt_OfferIapDialog();
+    qt_SaveIapName(settings, iapNames, iapNameValue);
+    return;
+
 }
 
 static int qt_SetDefaultIap()
diff --git a/examples/painting/svggenerator/displaywidget.cpp b/examples/painting/svggenerator/displaywidget.cpp
index 75ec02d..bad6d3a 100644
--- a/examples/painting/svggenerator/displaywidget.cpp
+++ b/examples/painting/svggenerator/displaywidget.cpp
@@ -63,7 +63,7 @@ DisplayWidget::DisplayWidget(QWidget *parent)
 }
 
 //! [paint event]
-void DisplayWidget::paintEvent(QPaintEvent *event)
+void DisplayWidget::paintEvent(QPaintEvent * /* event */)
 {
     QPainter painter;
     painter.begin(this);
diff --git a/examples/phonon/musicplayer/mainwindow.cpp b/examples/phonon/musicplayer/mainwindow.cpp
index af2b637..ee97c7a 100644
--- a/examples/phonon/musicplayer/mainwindow.cpp
+++ b/examples/phonon/musicplayer/mainwindow.cpp
@@ -181,7 +181,7 @@ void MainWindow::metaStateChanged(Phonon::State newState, Phonon::State /* oldSt
         QMessageBox::warning(this, tr("Error opening files"),
             metaInformationResolver->errorString());
         while (!sources.isEmpty() &&
-               !(sources.takeLast() == metaInformationResolver->currentSource()));
+               !(sources.takeLast() == metaInformationResolver->currentSource())) {}
         return;
     }