diff options
author | Gatis Paeglis <gatis.paeglis@theqtcompany.com> | 2015-07-06 15:14:27 +0200 |
---|---|---|
committer | Gatis Paeglis <gatis.paeglis@digia.com> | 2015-07-06 14:19:57 +0000 |
commit | a91a5c6f36da6b7324d0a52ecf1ab3c7517c5375 (patch) | |
tree | c5a738df67a356ef1cce185f564d3c1a8f8e9ef4 /src/wifi/wifi.pro | |
parent | 602034c3a71c53d050e67101e070185cbcf7ccee (diff) |
Wifi: Remove android specific code paths
eAndroid support has been deprecated.
Change-Id: Id62ce140917dc1e45e94e800dc8cdc54736dfc36
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
Diffstat (limited to 'src/wifi/wifi.pro')
-rw-r--r-- | src/wifi/wifi.pro | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/src/wifi/wifi.pro b/src/wifi/wifi.pro index f248774..e674c95 100644 --- a/src/wifi/wifi.pro +++ b/src/wifi/wifi.pro @@ -17,7 +17,8 @@ HEADERS += \ $$PWD/qwificontroller_p.h \ $$PWD/qwifidevice.h \ $$PWD/qwificonfiguration.h \ - $$PWD/qwifiutils_p.h + $$PWD/qwifiutils_p.h \ + $$PWD/qwifielinux_p.h SOURCES += \ $$PWD/qwifimanager.cpp \ @@ -26,20 +27,12 @@ SOURCES += \ $$PWD/qwificontroller.cpp \ $$PWD/qwifidevice.cpp \ $$PWD/qwificonfiguration.cpp \ - $$PWD/qwifiutils.cpp + $$PWD/qwifiutils.cpp \ + $$PWD/qwifielinux.cpp \ + $$[QT_SYSROOT]/usr/include/wpa-supplicant/wpa_ctrl.c \ + $$[QT_SYSROOT]/usr/include/wpa-supplicant/os_unix.c -android: { - LIBS += -lhardware_legacy -lcutils -} else { - DEFINES += \ - CONFIG_CTRL_IFACE \ - CONFIG_CTRL_IFACE_UNIX +DEFINES += \ + CONFIG_CTRL_IFACE \ + CONFIG_CTRL_IFACE_UNIX - HEADERS += \ - $$PWD/qwifielinux_p.h - - SOURCES += \ - $$PWD/qwifielinux.cpp \ - $$[QT_SYSROOT]/usr/include/wpa-supplicant/wpa_ctrl.c \ - $$[QT_SYSROOT]/usr/include/wpa-supplicant/os_unix.c -} |