3 files changed, 8 insertions, 5 deletions
diff --git a/src/network/bearer/qnetworkconfigmanager_p.cpp b/src/network/bearer/qnetworkconfigmanager_p.cpp
index c4f7c00..dd174bf 100644
--- a/src/network/bearer/qnetworkconfigmanager_p.cpp
+++ b/src/network/bearer/qnetworkconfigmanager_p.cpp
@@ -63,6 +63,7 @@ QNetworkConfigurationManagerPrivate::QNetworkConfigurationManagerPrivate()
 :   pollTimer(0), mutex(QMutex::Recursive), forcedPolling(0), firstUpdate(true)
 {
     qRegisterMetaType<QNetworkConfiguration>("QNetworkConfiguration");
+    qRegisterMetaType<QNetworkConfigurationPrivatePointer>("QNetworkConfigurationPrivatePointer");
 
     moveToThread(QCoreApplicationPrivate::mainThread());
     updateConfigurations();
diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h
index 02f9cb6..593dbbe 100644
--- a/src/network/bearer/qnetworkconfiguration.h
+++ b/src/network/bearer/qnetworkconfiguration.h
@@ -103,6 +103,7 @@ public:
 
     Q_DECLARE_FLAGS(StateFlags, StateFlag)
 
+#ifndef QT_MOBILITY_BEARER
     enum BearerType {
         BearerUnknown,
         BearerEthernet,
@@ -114,17 +115,22 @@ public:
         BearerBluetooth,
         BearerWiMAX
     };
+#endif
 
     StateFlags state() const;
     Type type() const;
     Purpose purpose() const;
 
-    // Required to maintain source compatibility with Qt Mobility.
+#ifndef QT_MOBILITY_BEARER
 #ifdef QT_DEPRECATED
+    // Required to maintain source compatibility with Qt Mobility.
     QT_DEPRECATED inline QString bearerName() const { return bearerTypeName(); }
 #endif
     BearerType bearerType() const;
     QString bearerTypeName() const;
+#else
+    QString bearerName() const;
+#endif
 
     QString identifier() const;
     bool isRoamingAvailable() const;
diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h
index e7fffac..0b40147 100644
--- a/src/network/bearer/qnetworksession.h
+++ b/src/network/bearer/qnetworksession.h
@@ -89,11 +89,7 @@ public:
         OperationNotSupportedError,
         InvalidConfigurationError
     };
-#ifndef QT_MOBILITY_BEARER
-    QNetworkSession(const QNetworkConfiguration& connConfig, QObject* parent =0);
-#else
 	explicit QNetworkSession(const QNetworkConfiguration& connConfig, QObject* parent =0);
-#endif
     virtual ~QNetworkSession();
 
     bool isOpen() const;