diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-04-15 07:01:12 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-04-15 07:01:12 (GMT) |
| commit | 6e189eb28161f2d09e0c71ecd590b7ccfd82321c (patch) | |
| tree | 635377ded015a9252a54b1940051e636d83ab675 /src/plugins/bearer/nativewifi | |
| parent | 3925bab16a88822fcef749cb6ba7c542688c2fae (diff) | |
| download | Qt-6e189eb28161f2d09e0c71ecd590b7ccfd82321c.zip Qt-6e189eb28161f2d09e0c71ecd590b7ccfd82321c.tar.gz Qt-6e189eb28161f2d09e0c71ecd590b7ccfd82321c.tar.bz2 | |
Add missing QT_NO_BEARERMANAGEMENT ifdefs.
This add addition ifdefs around code missed by MR 517.
Diffstat (limited to 'src/plugins/bearer/nativewifi')
| -rw-r--r-- | src/plugins/bearer/nativewifi/main.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/bearer/nativewifi/qnativewifiengine.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/bearer/nativewifi/qnativewifiengine.h | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/plugins/bearer/nativewifi/main.cpp b/src/plugins/bearer/nativewifi/main.cpp index d77462e..98789aa 100644 --- a/src/plugins/bearer/nativewifi/main.cpp +++ b/src/plugins/bearer/nativewifi/main.cpp @@ -50,6 +50,8 @@ #include <QtCore/qdebug.h> +#ifndef QT_NO_BEARERMANAGEMENT + QT_BEGIN_NAMESPACE static void resolveLibrary() @@ -137,3 +139,5 @@ Q_EXPORT_STATIC_PLUGIN(QNativeWifiEnginePlugin) Q_EXPORT_PLUGIN2(qnativewifibearer, QNativeWifiEnginePlugin) QT_END_NAMESPACE + +#endif // QT_NO_BEARERMANAGEMENT diff --git a/src/plugins/bearer/nativewifi/qnativewifiengine.cpp b/src/plugins/bearer/nativewifi/qnativewifiengine.cpp index 6c74159..e796df3 100644 --- a/src/plugins/bearer/nativewifi/qnativewifiengine.cpp +++ b/src/plugins/bearer/nativewifi/qnativewifiengine.cpp @@ -49,6 +49,8 @@ #include <QtCore/qdebug.h> +#ifndef QT_NO_BEARERMANAGEMENT + QT_BEGIN_NAMESPACE WlanOpenHandleProto local_WlanOpenHandle = 0; @@ -558,3 +560,5 @@ bool QNativeWifiEngine::requiresPolling() const } QT_END_NAMESPACE + +#endif // QT_NO_BEARERMANAGEMENT diff --git a/src/plugins/bearer/nativewifi/qnativewifiengine.h b/src/plugins/bearer/nativewifi/qnativewifiengine.h index 2005b2b..77764e4 100644 --- a/src/plugins/bearer/nativewifi/qnativewifiengine.h +++ b/src/plugins/bearer/nativewifi/qnativewifiengine.h @@ -57,6 +57,8 @@ #include <QtCore/qtimer.h> +#ifndef QT_NO_BEARERMANAGEMENT + QT_BEGIN_NAMESPACE class QNetworkConfigurationPrivate; @@ -101,4 +103,6 @@ private: QT_END_NAMESPACE +#endif // QT_NO_BEARERMANAGEMENT + #endif |