Merge branch 'stable' into releaseQtEE_v3.0.0

* stable: (25 commits)
  Add notes about Quick Compiler failures
  doc: Updated versions and supported platforms
  doc: Updated links to Qt EE known issues and product page
  Doc: Warn the user that his Nexus will be wiped.
  doc: move adb connection change info to customization
  Build wifi also on eLinux
  Don't show Wi-Fi group box on iMX6-eAndroid
  Fix class names for WebEngine
  Doc: add note about webengine's widget apis
  Doc: add change log for version 3.0.0
  doc: include sabre sd documentation
  Doc: Add setup instructions for Nexus 7 (2013)
  Set initial "backend ready" state.
  Port QtWifi to eLinux
  Add a note about webengine and emulator
  Doc: Update version
  Doc: Add table with all possible MACHINE values
  Doc: QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS replaces QT_QPA_GENERIC_PLUGINS
  Doc: Use precise naming for Boundary Devices i.MX6
  Add PowerManager service.
  ...

Change-Id: I2762dfe023d461b677d7ed748c33444145d35175

1 files changed, 17 insertions, 6 deletions

diff --git a/src/imports/wifi/wifi.pro b/src/imports/wifi/wifi.pro
index b920978..fcb6cdd 100644
--- a/src/imports/wifi/wifi.pro
+++ b/src/imports/wifi/wifi.pro
@@ -4,18 +4,29 @@ TARGET = qwifimodule
 TARGETPATH = Qt/labs/wifi
 IMPORT_VERSION = 0.1
 
+HEADERS += \
+    qwifimanager.h \
+    qwifinetwork.h \
+    qwifinetworklistmodel.h
+
 SOURCES += \
     pluginmain.cpp \
     qwifimanager.cpp \
     qwifinetwork.cpp \
     qwifinetworklistmodel.cpp
 
-HEADERS += \
-    qwifimanager.h \
-    qwifinetwork.h \
-    qwifinetworklistmodel.h
+android: {
+    LIBS += -lhardware_legacy -lcutils
+    DEFINES += FORCE_MOC
+} else {
+    DEFINES += CONFIG_CTRL_IFACE \
+               CONFIG_CTRL_IFACE_UNIX
 
-LIBS += -lhardware_legacy -lcutils
+    HEADERS += qwifi_elinux.h
+    SOURCES += \
+           qwifi_elinux.cpp \
+           $$[QT_SYSROOT]/usr/include/wpa-supplicant/wpa_ctrl.c \
+           $$[QT_SYSROOT]/usr/include/wpa-supplicant/os_unix.c
+}
 
 load(qml_plugin)
-