Merge remote-tracking branch 'earth-team/master' into earth-staging-master

1 files changed, 14 insertions, 0 deletions

diff --git a/src/network/socket/qabstractsocketengine.cpp b/src/network/socket/qabstractsocketengine.cpp
index 9fe6959..c29f936 100644
--- a/src/network/socket/qabstractsocketengine.cpp
+++ b/src/network/socket/qabstractsocketengine.cpp
@@ -40,7 +40,13 @@
 ****************************************************************************/
 
 #include "qabstractsocketengine_p.h"
+
+#ifdef Q_OS_SYMBIAN
+#include "qsymbiansocketengine_p.h"
+#else
 #include "qnativesocketengine_p.h"
+#endif
+
 #include "qmutex.h"
 #include "qnetworkproxy.h"
 
@@ -113,7 +119,11 @@ QAbstractSocketEngine *QAbstractSocketEngine::createSocketEngine(QAbstractSocket
         return 0;
 #endif
 
+#ifdef Q_OS_SYMBIAN
+    return new QSymbianSocketEngine(parent);
+#else
     return new QNativeSocketEngine(parent);
+#endif
 }
 
 QAbstractSocketEngine *QAbstractSocketEngine::createSocketEngine(int socketDescripter, QObject *parent)
@@ -123,7 +133,11 @@ QAbstractSocketEngine *QAbstractSocketEngine::createSocketEngine(int socketDescr
         if (QAbstractSocketEngine *ret = socketHandlers()->at(i)->createSocketEngine(socketDescripter, parent))
             return ret;
     }
+#ifdef Q_OS_SYMBIAN
+    return new QSymbianSocketEngine(parent);
+#else
     return new QNativeSocketEngine(parent);
+#endif
 }
 
 QAbstractSocket::SocketError QAbstractSocketEngine::error() const