Merge branch 'bearermanagement/corewlan' into bearermanagement/integration-2

Conflicts:
	config.tests/mac/corewlan/corewlan.pro
	examples/network/bearercloud/bearercloud.pro
	examples/network/bearermonitor/bearermonitor.pro
	src/network/bearer/bearer.pro
	src/network/bearer/qnativewifiengine_win.cpp
	src/network/bearer/qnetworkconfigmanager_p.cpp
	src/network/bearer/qnetworkconfiguration_s60_p.cpp
	src/network/bearer/qnetworksession.cpp
	src/network/bearer/qnetworksession_p.cpp
	src/network/bearer/qnmwifiengine_unix.cpp
	src/network/bearer/qnmwifiengine_unix_p.h
	src/plugins/bearer/corewlan/qcorewlanengine.mm
	src/plugins/bearer/generic/qgenericengine.cpp
	src/plugins/bearer/nla/main.cpp
	src/plugins/bearer/nla/qnlaengine.cpp
	tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro
	tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro
	tests/auto/qnetworksession/lackey/lackey.pro
	tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
	tests/manual/bearerex/bearerex.pro
	tests/manual/networkmanager/networkmanager.pro

1 files changed, 84 insertions, 0 deletions

diff --git a/src/plugins/bearer/networkmanager/main.cpp b/src/plugins/bearer/networkmanager/main.cpp
new file mode 100644
index 0000000..b561415
--- /dev/null
+++ b/src/plugins/bearer/networkmanager/main.cpp
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qnetworkmanagerengine.h"
+
+#include <QtNetwork/qbearerplugin.h>
+
+#include <QtCore/qdebug.h>
+
+QT_BEGIN_NAMESPACE
+
+class QNetworkManagerEnginePlugin : public QBearerEnginePlugin
+{
+public:
+    QNetworkManagerEnginePlugin();
+    ~QNetworkManagerEnginePlugin();
+
+    QStringList keys() const;
+    QBearerEngine *create(const QString &key) const;
+};
+
+QNetworkManagerEnginePlugin::QNetworkManagerEnginePlugin()
+{
+}
+
+QNetworkManagerEnginePlugin::~QNetworkManagerEnginePlugin()
+{
+}
+
+QStringList QNetworkManagerEnginePlugin::keys() const
+{
+    return QStringList() << QLatin1String("networkmanager");
+}
+
+QBearerEngine *QNetworkManagerEnginePlugin::create(const QString &key) const
+{
+    if (key == QLatin1String("networkmanager"))
+        return new QNetworkManagerEngine;
+    else
+        return 0;
+}
+
+Q_EXPORT_STATIC_PLUGIN(QNetworkManagerEnginePlugin)
+Q_EXPORT_PLUGIN2(qnmbearer, QNetworkManagerEnginePlugin)
+
+QT_END_NAMESPACE