diff options
| author | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-06-02 04:20:54 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-06-02 04:20:54 +0000 |
| commit | 7bc9310a2265e14b6880aa29d96adba6d3d7aed0 (patch) | |
| tree | 0bf906e3585c93cbe5ef67a05b4a129e18e3edbd /src/plugins | |
| parent | 6e008cd57955c8029671c4c92250b86767f8ec1f (diff) | |
| parent | fcfd31c9fdd84b234cb9e42b97be62ec18389b61 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5.0
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/bearer/corewlan/qcorewlanengine.mm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm index a30d8f69c4..eb756db39e 100644 --- a/src/plugins/bearer/corewlan/qcorewlanengine.mm +++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm @@ -44,6 +44,7 @@ #include <QtCore/qdebug.h> #include <QDir> +#ifndef QT_NO_BEARERMANAGEMENT extern "C" { // Otherwise it won't find CWKeychain* symbols at link time #import <CoreWLAN/CoreWLAN.h> @@ -890,3 +891,5 @@ quint64 QCoreWlanEngine::getBytes(const QString &interfaceName, bool b) } QT_END_NAMESPACE + +#endif |