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/corewlan | |
| 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/corewlan')
| -rw-r--r-- | src/plugins/bearer/corewlan/main.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/bearer/corewlan/qcorewlanengine.h | 5 | ||||
| -rw-r--r-- | src/plugins/bearer/corewlan/qcorewlanengine.mm | 8 |
3 files changed, 14 insertions, 3 deletions
diff --git a/src/plugins/bearer/corewlan/main.cpp b/src/plugins/bearer/corewlan/main.cpp index 5be8c0e..628ec61 100644 --- a/src/plugins/bearer/corewlan/main.cpp +++ b/src/plugins/bearer/corewlan/main.cpp @@ -45,6 +45,8 @@ #include <QtCore/qdebug.h> +#ifndef QT_NO_BEARERMANAGEMENT + QT_BEGIN_NAMESPACE class QCoreWlanEnginePlugin : public QBearerEnginePlugin @@ -82,3 +84,5 @@ Q_EXPORT_STATIC_PLUGIN(QCoreWlanEnginePlugin) Q_EXPORT_PLUGIN2(qcorewlanbearer, QCoreWlanEnginePlugin) QT_END_NAMESPACE + +#endif // QT_NO_BEARERMANAGEMENT diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.h b/src/plugins/bearer/corewlan/qcorewlanengine.h index 11f5d96..5c69299 100644 --- a/src/plugins/bearer/corewlan/qcorewlanengine.h +++ b/src/plugins/bearer/corewlan/qcorewlanengine.h @@ -48,6 +48,8 @@ #include <QTimer> #include <SystemConfiguration/SystemConfiguration.h> +#ifndef QT_NO_BEARERMANAGEMENT + QT_BEGIN_NAMESPACE class QNetworkConfigurationPrivate; @@ -107,5 +109,6 @@ protected: QT_END_NAMESPACE -#endif +#endif // QT_NO_BEARERMANAGEMENT +#endif diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm index e418432..268126a 100644 --- a/src/plugins/bearer/corewlan/qcorewlanengine.mm +++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm @@ -67,6 +67,10 @@ #include <private/qt_cocoa_helpers_mac_p.h> #include "private/qcore_mac_p.h" +#ifndef QT_NO_BEARERMANAGEMENT + +QT_BEGIN_NAMESPACE + @interface QNSListener : NSObject { NSNotificationCenter *center; @@ -126,8 +130,6 @@ QNSListener *listener = 0; -QT_BEGIN_NAMESPACE - void networkChangeCallback(SCDynamicStoreRef/* store*/, CFArrayRef changedKeys, void *info) { for ( long i = 0; i < CFArrayGetCount(changedKeys); i++) { @@ -778,3 +780,5 @@ void QCoreWlanEngine::getUserConfigurations() } QT_END_NAMESPACE + +#endif // QT_NO_BEARERMANAGEMENT |