summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Koskinen <janne.p.koskinen@digia.com>2009-10-26 12:24:35 (GMT)
committerJanne Koskinen <janne.p.koskinen@digia.com>2009-10-26 12:24:35 (GMT)
commit962f875cd48a42cb69855ba05b979aa4a50ca2a2 (patch)
tree76bcce403a5096cd8023e6c8caa78ca05035d4ab
parent5476377d3bde8165e6832b7d90d5936a0154d11b (diff)
downloadQt-962f875cd48a42cb69855ba05b979aa4a50ca2a2.zip
Qt-962f875cd48a42cb69855ba05b979aa4a50ca2a2.tar.gz
Qt-962f875cd48a42cb69855ba05b979aa4a50ca2a2.tar.bz2
Emulator IAP fix for Symbian
Don't display multiple useless IAP dialogs in the emulator environment. If you need specific IAP then you need to revert this commit. Reviewed-by: Aleksandar Babic
-rw-r--r--examples/network/qftp/sym_iap_util.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/examples/network/qftp/sym_iap_util.h b/examples/network/qftp/sym_iap_util.h
index ebeae0a..9b4128c 100644
--- a/examples/network/qftp/sym_iap_util.h
+++ b/examples/network/qftp/sym_iap_util.h
@@ -501,10 +501,14 @@ static void qt_SetDefaultIapL()
static int qt_SetDefaultIap()
{
+#ifndef __WINS__
TRAPD(err1, qt_SetDefaultIapL());
// TRAPD(err2, qt_InterfaceInfoL());
// TRAPD(err3, qt_RouteInfoL());
return err1;
+#else
+ return 0; // IAP dialog not required for emulator
+#endif
}
#endif // QSYM_IAP_UTIL_H