Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
	configure.exe
	examples/multimedia/audioinput/audioinput.cpp
	src/corelib/io/qfsfileengine.cpp
	src/gui/egl/qegl_wince.cpp
	src/gui/egl/qeglproperties.cpp
	src/gui/egl/qeglproperties_p.h
	src/gui/embedded/directfb.pri
	src/gui/kernel/qapplication_win.cpp
	src/gui/painting/qdrawutil.cpp
	src/opengl/qgl_p.h
	src/sql/drivers/odbc/qsql_odbc.cpp
	src/sql/drivers/odbc/qsql_odbc.h
	tests/auto/auto.pro
	tests/auto/qgl/tst_qgl.cpp
	translations/assistant_adp_ru.ts

1 files changed, 11 insertions, 5 deletions

diff --git a/examples/network/qftp/sym_iap_util.h b/examples/network/qftp/sym_iap_util.h
index 41e43a9..445036a 100644
--- a/examples/network/qftp/sym_iap_util.h
+++ b/examples/network/qftp/sym_iap_util.h
@@ -60,6 +60,7 @@
 //#include <QTextCodec>
 
 _LIT(KIapNameSetting, "IAP\\Name");             // text - mandatory
+_LIT(KIapTableIdField, "IAP\Id");
 _LIT(KIapDialogPref, "IAP\\DialogPref");        // TUnit32 - optional
 _LIT(KIapService, "IAP\\IAPService");           // TUnit32 - mandatory
 _LIT(KIapServiceType, "IAP\\IAPServiceType");   // text - mandatory
@@ -367,20 +368,25 @@ static QString qt_OfferIapDialog() {
     CleanupClosePushL(connection);
 
     socketServ.Connect();
+
+    TCommDbConnPref prefs;
+    prefs.SetDialogPreference(ECommDbDialogPrefPrompt);
+
     connection.Open(socketServ);
-    connection.Start();
+    connection.Start(prefs);
 
     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("");
+    if(!strIapName.isEmpty()) {
+        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);