Merge lp:~apachelogger/kubuntu-packaging/qtbase-opensource-src-fixkonvi into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

[Harald Sitter]

fixes qnetworkconfigurationmanager getting confused with both ethernet and wifi

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-23 09:58:44 +0000
+++ debian/changelog	2015-02-24 08:39:20 +0000
@@ -1,3 +1,11 @@
+qtbase-opensource-src (5.4.0+dfsg-4ubuntu4) UNRELEASED; urgency=medium
+
+  * Add upstream_Call-ofono-nm-Registered-delayed-in-constructor-othe.patch
+    To prevent connection states from getting lost resulting in QNCM thinking
+    the system is offline when in fact it isn't (LP: #1424960)
+
+ -- Harald Sitter <[e-mail]>  Tue, 24 Feb 2015 09:22:42 +0100
+
 qtbase-opensource-src (5.4.0+dfsg-4ubuntu3) vivid; urgency=medium
 
   [ Scott Kitterman ]

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-02-23 09:58:44 +0000
+++ debian/patches/series	2015-02-24 08:39:20 +0000
@@ -30,3 +30,4 @@
 upstream_xcb-Update-mouse-buttons-from-MotionNotify-events.patch
 upstream_Handle-SelectionClientClose-in-QXcbClipboard.patch
 upstream-gerrit_Handle-SelectionWindowDestroy-in-QXcbClipboard.patch
+upstream_Call-ofono-nm-Registered-delayed-in-constructor-othe.patch

=== added file 'debian/patches/upstream_Call-ofono-nm-Registered-delayed-in-constructor-othe.patch'
--- debian/patches/upstream_Call-ofono-nm-Registered-delayed-in-constructor-othe.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/upstream_Call-ofono-nm-Registered-delayed-in-constructor-othe.patch	2015-02-24 08:39:20 +0000
@@ -0,0 +1,37 @@
+From 8d6341a721d07e3cc30032bcc89f7e25cb00b9eb Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <[e-mail]>
+Date: Mon, 16 Feb 2015 22:53:02 +0100
+Subject: [PATCH] Call [ofono|nm]Registered delayed in constructor otherwise
+ signals will be lost
+
+If we call them just in the constructor all the signals they sent
+out can't be connected and will be lost, particularly this means
+the QNetworkConfigurationManager doesn't see my ethernet connection
+and thus thinks i'm not online
+
+Change-Id: I1480f76338d6ae4fbed676f9fa40ada18ea431ad
+Reviewed-by: Alex Blasche <[e-mail]>
+---
+ src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
+index f52b9d4..0378ac7 100644
+--- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
++++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
+@@ -80,10 +80,10 @@ QNetworkManagerEngine::QNetworkManagerEngine(QObject *parent)
+             this, SLOT(ofonoUnRegistered(QString)));
+ 
+     if (QDBusConnection::systemBus().interface()->isServiceRegistered("org.ofono"))
+-        ofonoRegistered();
++        QMetaObject::invokeMethod(this, "ofonoRegistered", Qt::QueuedConnection);
+ 
+     if (QDBusConnection::systemBus().interface()->isServiceRegistered(NM_DBUS_SERVICE))
+-        nmRegistered();
++        QMetaObject::invokeMethod(this, "nmRegistered", Qt::QueuedConnection);
+ }
+ 
+ QNetworkManagerEngine::~QNetworkManagerEngine()
+-- 
+2.1.4
+