[SCM] qtsystems packaging branch, master, updated. 00b5912400b45fbcf7486370b08f9c2b4b88fbaf

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtsystems.git;a=commitdiff;h=9753623

The following commit has been merged in the master branch:
commit 97536237088fff9b1ab2229d92f48f0bc05a98df
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Jul 15 07:35:31 2014 +0000

    debian/patches/wlan_detect.patch:
    
    * debian/patches/wlan_detect.patch:
      - Fix WLAN detection
---
 debian/changelog                 |  2 ++
 debian/patches/wlan_detect.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 417eb8d..b0561b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,5 +10,7 @@ qtsystems-opensource-src (5.0~git20130712-1) UNRELEASED; urgency=low
     - Fix qserviceinterfacedescriptor unit test
   * debian/patches/skip_failing_tests.patch:
     - Skip failing unit tests to allow the rest to be run during build
+  * debian/patches/wlan_detect.patch:
+    - Fix WLAN detection
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 30 Jan 2013 14:15:42 +0200
diff --git a/debian/patches/wlan_detect.patch b/debian/patches/wlan_detect.patch
new file mode 100644
index 0000000..df07275
--- /dev/null
+++ b/debian/patches/wlan_detect.patch
@@ -0,0 +1,26 @@
+Description: Workaround WLAN detection
+ Allow returning of WLAN information even when network signal strength 
+ is not available. It's a workaround to the fact that the kernel driver 
+ for mako (Nexus 4) does not return the signal strength ever.
+ .
+Author: Ricardo Salveti <ricardo.salveti at canonical.com>
+Origin: Canonical
+Forwarded: https://codereview.qt-project.org/66904
+Bug: https://bugreports.qt-project.org/browse/QTBUG-33748
+Bug-Ubuntu: https://launchpad.net/bugs/1231196
+Last-Update: 2013-09-30
+
+diff --git a/src/systeminfo/linux/qnetworkinfo_linux.cpp b/src/systeminfo/linux/qnetworkinfo_linux.cpp
+index effdc93..03649c1 100644
+--- a/src/systeminfo/linux/qnetworkinfo_linux.cpp
++++ b/src/systeminfo/linux/qnetworkinfo_linux.cpp
+@@ -869,8 +869,7 @@ QNetworkInfo::NetworkStatus QNetworkInfoPrivate::getNetworkStatus(QNetworkInfo::
+             if (carrier.open(QIODevice::ReadOnly)) {
+                 char state;
+                 if ((carrier.read(&state, 1) == 1) &&
+-                        (state == '1') &&
+-                        (networkSignalStrength(QNetworkInfo::WlanMode, interface) > -1)) {
++                        (state == '1')) {
+                     return QNetworkInfo::HomeNetwork;
+                 }
+             }

-- 
qtsystems packaging