diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-04-19 12:36:42 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-04-19 12:36:42 (GMT) |
| commit | 096c7d37ec67a4db7b812debed5f51737ec38900 (patch) | |
| tree | 9276b3b8d92d6b935da1b63dac352a8d96c70e58 /src/plugins/bearer/nativewifi | |
| parent | 813f10c861d14a9c2af2832f597bc3987756221d (diff) | |
| parent | 4676dd62871da2b58452ebda477a04c25158bec4 (diff) | |
| download | Qt-096c7d37ec67a4db7b812debed5f51737ec38900.zip Qt-096c7d37ec67a4db7b812debed5f51737ec38900.tar.gz Qt-096c7d37ec67a4db7b812debed5f51737ec38900.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
doc/src/template/style/style.css
tools/qdoc3/htmlgenerator.cpp
Diffstat (limited to 'src/plugins/bearer/nativewifi')
| -rw-r--r-- | src/plugins/bearer/nativewifi/main.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/bearer/nativewifi/nativewifi.pro | 2 | ||||
| -rw-r--r-- | src/plugins/bearer/nativewifi/qnativewifiengine.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/bearer/nativewifi/qnativewifiengine.h | 4 |
4 files changed, 13 insertions, 1 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/nativewifi.pro b/src/plugins/bearer/nativewifi/nativewifi.pro index f277a04..36dd36d 100644 --- a/src/plugins/bearer/nativewifi/nativewifi.pro +++ b/src/plugins/bearer/nativewifi/nativewifi.pro @@ -1,7 +1,7 @@ TARGET = qnativewifibearer include(../../qpluginbase.pri) -QT += network +QT = core network HEADERS += qnativewifiengine.h \ platformdefs.h \ 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 |