diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2010-04-21 07:14:07 (GMT) |
---|---|---|
committer | Alan Alpert <alan.alpert@nokia.com> | 2010-04-21 07:14:07 (GMT) |
commit | d420eb68b9a306f0fccf3000a8af31aa00cb0cd9 (patch) | |
tree | 44c958741cd0189acd5ac875d57d28165f051aae /src/plugins/bearer/nativewifi/main.cpp | |
parent | 202af3021362d3c8066bc479a95e7aad889bd928 (diff) | |
parent | b72f9dacb352aa4be888c5f7f1a482dbcba1f456 (diff) | |
download | Qt-d420eb68b9a306f0fccf3000a8af31aa00cb0cd9.zip Qt-d420eb68b9a306f0fccf3000a8af31aa00cb0cd9.tar.gz Qt-d420eb68b9a306f0fccf3000a8af31aa00cb0cd9.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/plugins/bearer/nativewifi/main.cpp')
-rw-r--r-- | src/plugins/bearer/nativewifi/main.cpp | 4 |
1 files changed, 4 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 |