diff options
author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-01-05 05:05:41 (GMT) |
---|---|---|
committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-01-05 05:05:41 (GMT) |
commit | c9a68d0c2b83d67359d153e0323b10147ef9b2e0 (patch) | |
tree | c2121c6d7e129cd30e7496e98013ab41e0d00422 /src/network/bearer/qnetworkconfigmanager.h | |
parent | 31e6fc5ae7f7fbe2f23b519cb76dcc579dac1f41 (diff) | |
parent | ca7fe1713ff82dcde8fb2fdfb0664b5dfa830bd7 (diff) | |
download | Qt-c9a68d0c2b83d67359d153e0323b10147ef9b2e0.zip Qt-c9a68d0c2b83d67359d153e0323b10147ef9b2e0.tar.gz Qt-c9a68d0c2b83d67359d153e0323b10147ef9b2e0.tar.bz2 |
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
Diffstat (limited to 'src/network/bearer/qnetworkconfigmanager.h')
-rw-r--r-- | src/network/bearer/qnetworkconfigmanager.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/network/bearer/qnetworkconfigmanager.h b/src/network/bearer/qnetworkconfigmanager.h index 98641f6..b7ab72b 100644 --- a/src/network/bearer/qnetworkconfigmanager.h +++ b/src/network/bearer/qnetworkconfigmanager.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the QtNetwork module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -42,17 +42,15 @@ #ifndef QNETWORKCONFIGURATIONMANAGER_H #define QNETWORKCONFIGURATIONMANAGER_H -#include "qmobilityglobal.h" - #include <QtCore/qobject.h> #include "qnetworkconfiguration.h" QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QNetworkConfigurationManagerPrivate; -class Q_BEARER_EXPORT QNetworkConfigurationManager : public QObject +class Q_NETWORK_EXPORT QNetworkConfigurationManager : public QObject { Q_OBJECT @@ -93,7 +91,7 @@ Q_SIGNALS: Q_DECLARE_OPERATORS_FOR_FLAGS(QNetworkConfigurationManager::Capabilities) -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER |