Merge branch 'stable' into dev

* stable: (22 commits)
  Add note about headphones on eAndroid
  Doc: Relocate unmount instructions
  Doc: Add ChangeLog for Qt Enterprise Embedded 2.1.0
  Doc: Disable code highlighting for command-line instructions
  doc: update version number to 2.1.0
  [Wifi] Add new enums and make some API changes
  Doc: Add documentation on custom build & deploy steps
  Doc: Create QML Type reference page
  Doc: Add information about licenses in embedded Linux images
  Doc: Improve instructions for deploying existing projects
  Doc: Separate Building Your Own Linux Image into its own page
  doc: use same directory for yocto and qt
  doc: config.<MACHINE> needed only once
  doc: guide for imx53 and how to setup QtCreator
  Doc: Be more precise on screen content for Nexus7
  Add documentation to QtWifi library
  Doc: Add note for users to not use root for installation
  doc: describe how to use network connection for adb
  Rename misleading class name
  Remove unnecessary roles from QWifiNetworkList
  ...

Conflicts:
	src/imports/wifi/qwifimanager.cpp

Change-Id: Ie7efa2ec91ac154f1e984600f569d9c7f8383627

1 files changed, 74 insertions, 1 deletions

diff --git a/src/imports/wifi/qwifinetwork.cpp b/src/imports/wifi/qwifinetwork.cpp
index a159e59..d4c20ef 100644
--- a/src/imports/wifi/qwifinetwork.cpp
+++ b/src/imports/wifi/qwifinetwork.cpp
@@ -18,7 +18,73 @@
 ****************************************************************************/
 #include "qwifinetwork.h"
 
-QWifiNetwork::QWifiNetwork()
+/*!
+    \qmltype WifiNetwork
+    \inqmlmodule Qt.labs.wifi
+    \ingroup wifi-qmltypes
+    \brief Represents a single WiFi network access point.
+
+    Instances of WifiNetwork cannot be created directly from the QML system, use
+    WifiManager::networks.
+*/
+
+/*!
+    \qmlproperty string WifiNetwork::bssid
+
+    This property holds basic service set identification of a network, used to uniquely
+    identify BSS.
+
+*/
+
+/*!
+    \qmlproperty string WifiNetwork::ssid
+
+    This property holds a network name. The SSID is the informal (human) name of BSS.
+*/
+
+/*!
+    \qmlproperty int WifiNetwork::signalStrength
+
+    This property holds the current strength of a WiFi signal, measured in dBm. New readings are
+    taken every 5 seconds.
+
+    \sa signalStrengthChanged
+*/
+
+/*!
+    \qmlproperty bool WifiNetwork::supportsWPA
+
+    This property holds whether network access point supports WPA security protocol.
+*/
+
+/*!
+    \qmlproperty bool WifiNetwork::supportsWPA2
+
+    This property holds whether network access point supports WPA2 security protocol.
+*/
+
+/*!
+    \qmlproperty bool WifiNetwork::supportsWEP
+
+    This property holds whether network access point supports WEP security protocol.
+*/
+
+/*!
+    \qmlproperty bool WifiNetwork::supportsWPS
+
+    This property holds whether network access point supports WPS security protocol.
+*/
+
+/*!
+    \qmlsignal void WifiNetwork::signalStrengthChanged(int strength)
+
+    This signal is emitted whenever signal strength has changed comparing the the
+    previous reading, the new signal's strength is \a strength.
+
+*/
+
+QWifiNetwork::QWifiNetwork() :
+    m_outOfRange(false)
 {
 }
 
@@ -29,3 +95,10 @@ void QWifiNetwork::setSignalStrength(int strength)
     m_signalStrength = strength;
     emit signalStrengthChanged(m_signalStrength);
 }
+
+void QWifiNetwork::setOutOfRange(bool outOfRange)
+{
+    if (m_outOfRange == outOfRange)
+        return;
+    m_outOfRange = outOfRange;
+}