diff options
| author | Gatis Paeglis <gatis.paeglis@digia.com> | 2014-06-30 12:18:08 +0200 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@digia.com> | 2014-06-30 14:22:24 +0300 |
| commit | 7fd7d05ca382fd4dc1d609c8fe4544bb88764cff (patch) | |
| tree | d47ac7646644899b7afca953544256a69caea8eb | |
| parent | 5de04cef57fe33e257aebc407ed327e7d4f793bb (diff) | |
Fix #ifdef for Android detection
It was wrongly adding "IFNAME=" to wpa_supplicant calls
on eLinux, "IFNAME=" is required only for eAndroid.
Change-Id: Ic16d321765071df66fbffc1c3d6ce78180eb3b1c
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
| -rw-r--r-- | src/imports/wifi/qwifimanager.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/imports/wifi/qwifimanager.cpp b/src/imports/wifi/qwifimanager.cpp index dd395c0..8eec3e0 100644 --- a/src/imports/wifi/qwifimanager.cpp +++ b/src/imports/wifi/qwifimanager.cpp @@ -619,9 +619,11 @@ QByteArray QWifiManager::call(const char *command) const char data[2048]; size_t len = sizeof(data) - 1; // -1: room to add a 0-terminator QByteArray cmd; +#ifdef Q_OS_ANDROID #if !(Q_ANDROID_VERSION_MAJOR == 4 && Q_ANDROID_VERSION_MINOR < 4) cmd.append("IFNAME=").append(m_interface).append(" "); #endif +#endif cmd.append(command); if (q_wifi_command(m_interface.constData(), cmd.constData(), data, &len) < 0) { qWarning("QWifiManager: call failed: %s", cmd.constData()); @@ -630,7 +632,7 @@ QByteArray QWifiManager::call(const char *command) const if (len < sizeof(data)) data[len] = 0; QByteArray result = QByteArray::fromRawData(data, len); - if (QT_WIFI_DEBUG) qDebug("QWifiManager::call: %s ==>\n%s", command, result.constData()); + if (QT_WIFI_DEBUG) qDebug("QWifiManager::call: %s ==>\n%s", cmd.constData(), result.constData()); return result; } |