Merge branch 'stable' into releaseQtEE_v2.0.0

* stable: (90 commits)
  Doc: Document support services for Yocto recipes
  doc: minor changes to customization inline code blocks
  Doc: Clarify which Qt Creator templates work out of the box
  Doc: Fix missing sudo for i.MX6 embedded Linux deployment
  Doc: Fixed 32bit package install command for newer ubuntu versions
  doc: add quide how to use b2qt_build_scripts
  Doc: Add instructions how to install newer VirtualBox
  [Wifi] Fix initialization code
  Doc: Explain about disabling surfaceflinger
  Enable internet on eAndroid emulator
  Doc: Add instructions for building Boot2Qt demos
  Doc: Troubleshooting entry for BeagleBone Black HDMI issues
  Don't use wifi on Emulator
  Doc: Document building your own embedded linux stack
  Update copyright year
  Doc: Fix the 2.0 release date
  Doc: ChangeLog: Remove 'black screen after exit' from bugfixes
  Doc: Use a global Qt documentation template
  Doc: Add changelog
  Disable QConnectivity daemon on emulator
  ...

Change-Id: I25ba7e19677c3d91d5e78ab68291296face3c073

1 files changed, 19 insertions, 1 deletions

diff --git a/src/imports/wifi/qwifinetworklist.h b/src/imports/wifi/qwifinetworklist.h
index f6e134c..84e78fc 100644
--- a/src/imports/wifi/qwifinetworklist.h
+++ b/src/imports/wifi/qwifinetworklist.h
@@ -1,3 +1,21 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use the contact form at
+** http://qt.digia.com/
+**
+** This file is part of Qt Enterprise Embedded.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** the contact form at http://qt.digia.com/
+**
+****************************************************************************/
 #ifndef QWIFINETWORKLIST_H
 #define QWIFINETWORKLIST_H
 
@@ -18,7 +36,7 @@ public:
 
     void parseScanResults(const QByteArray &data);
 
-    QWifiNetwork *networkForBSSID(const QByteArray &bssid, int *pos);
+    QWifiNetwork *networkForSSID(const QByteArray &ssid, int *pos);
 
     int rowCount(const QModelIndex &) const { return m_networks.size(); }
     QVariant data(const QModelIndex &index, int role) const;