diff options
| author | Philipp Andreas <github@smurfy.de> | 2014-07-12 09:29:47 +0200 |
|---|---|---|
| committer | Philipp Andreas <github@smurfy.de> | 2014-07-12 09:30:49 +0200 |
| commit | 2101baf2911d7965c86e5308e4d8350790a6956c (patch) | |
| tree | 2acb875cabca055797620458baad26d5f8612105 /daemon/voicecallmanager.h | |
| parent | 959e251f2336e21d3615b1525a38773fe58ab2e7 (diff) | |
| parent | 84e775d768f0675ee733132b3762db647f1409ac (diff) | |
Merge branch 'master' into notifications
Conflicts:
daemon/manager.cpp
Diffstat (limited to 'daemon/voicecallmanager.h')
| -rw-r--r-- | daemon/voicecallmanager.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/daemon/voicecallmanager.h b/daemon/voicecallmanager.h index de18781..afb9a11 100644 --- a/daemon/voicecallmanager.h +++ b/daemon/voicecallmanager.h @@ -4,9 +4,9 @@ #include "voicecallhandler.h" #include <QObject> - #include <QDBusInterface> #include <QDBusPendingCallWatcher> +#include "Logger" class VoiceCallProviderData { @@ -27,6 +27,7 @@ typedef QList<VoiceCallHandler*> VoiceCallHandlerList; class VoiceCallManager : public QObject { Q_OBJECT + LOG4QT_DECLARE_QCLASS_LOGGER Q_PROPERTY(QDBusInterface* interface READ interface) |