Merge remote-tracking branch 'javispedro/js-testing'

Conflicts:
	daemon/daemon.pro
	daemon/dbusconnector.cpp
	daemon/manager.cpp
	daemon/watchcommands.cpp
	daemon/watchcommands.h
	daemon/watchconnector.cpp
	daemon/watchconnector.h
	log4qt-debug.conf
	log4qt-release.conf
	rpm/pebble.spec
	rpm/pebble.yaml

1 files changed, 7 insertions, 0 deletions

diff --git a/daemon/voicecallmanager.cpp b/daemon/voicecallmanager.cpp
index 68f36e0..afb3629 100644
--- a/daemon/voicecallmanager.cpp
+++ b/daemon/voicecallmanager.cpp
@@ -148,6 +148,13 @@ void VoiceCallManager::dial(const QString &provider, const QString &msisdn)
     QObject::connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), SLOT(onPendingCallFinished(QDBusPendingCallWatcher*)));
 }
 
+void VoiceCallManager::hangupAll()
+{
+    foreach (VoiceCallHandler* handler, voiceCalls()) {
+        handler->hangup();
+    }
+}
+
 void VoiceCallManager::silenceRingtone()
 {
     Q_D(const VoiceCallManager);