From a9a2a8fd30e0a1df317fc08c716da6c8be51ff2d Mon Sep 17 00:00:00 2001
From: Michael Zanetti <mzanetti@kde.org>
Date: Sun, 4 May 2014 13:33:05 +0200
Subject: [PATCH] enable coverage for deviceplugins too

---
 guh.pri                                         | 5 +++--
 guh.pro                                         | 4 ++++
 plugins/deviceplugins/mock/devicepluginmock.cpp | 5 +++++
 plugins/plugins.pri                             | 2 ++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/guh.pri b/guh.pri
index b49266cd..c598d199 100644
--- a/guh.pri
+++ b/guh.pri
@@ -1,10 +1,11 @@
+# Parse and export GUH_VERSION_STRING
 GUH_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"')
+DEFINES += GUH_VERSION_STRING=\\\"$${GUH_VERSION_STRING}\\\"
 
+# Enable coverage option
 coverage {
-    message("Building coverage.")
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage -O0
     LIBS += -lgcov
     QMAKE_LFLAGS += -fprofile-arcs
 }
 
-DEFINES += GUH_VERSION_STRING=\\\"$${GUH_VERSION_STRING}\\\"
diff --git a/guh.pro b/guh.pro
index 23c638c4..73c0d1e1 100644
--- a/guh.pro
+++ b/guh.pro
@@ -14,3 +14,7 @@ licensecheck.commands = $$top_srcdir/tests/auto/checklicenseheaders.sh $$top_src
 test.depends = licensecheck check
 
 QMAKE_EXTRA_TARGETS += licensecheck doc test
+
+coverage {
+    message("Building coverage.")
+}
diff --git a/plugins/deviceplugins/mock/devicepluginmock.cpp b/plugins/deviceplugins/mock/devicepluginmock.cpp
index 95379d01..6ab08034 100644
--- a/plugins/deviceplugins/mock/devicepluginmock.cpp
+++ b/plugins/deviceplugins/mock/devicepluginmock.cpp
@@ -312,6 +312,11 @@ void DevicePluginMock::emitDeviceSetupFinished()
 {
     qDebug() << "emitting setup finised";
     Device *device = m_asyncSetupDevices.takeFirst();
+    if (!myDevices().contains(device)) {
+        qWarning() << "Should emit deviceSetupFinished but device seems to have gone.";
+        return;
+    }
+
     if (device->deviceClassId() == mockDeviceAsyncSetupClassId) {
         emit deviceSetupFinished(device, DeviceManager::DeviceSetupStatusSuccess, QString());
     } else {
diff --git a/plugins/plugins.pri b/plugins/plugins.pri
index 8173be8e..b4d6e9a0 100644
--- a/plugins/plugins.pri
+++ b/plugins/plugins.pri
@@ -1,3 +1,5 @@
+include(../guh.pri)
+
 TEMPLATE = lib
 CONFIG += plugin static c++11