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/manager.h | |
| parent | 959e251f2336e21d3615b1525a38773fe58ab2e7 (diff) | |
| parent | 84e775d768f0675ee733132b3762db647f1409ac (diff) | |
Merge branch 'master' into notifications
Conflicts:
daemon/manager.cpp
Diffstat (limited to 'daemon/manager.h')
| -rw-r--r-- | daemon/manager.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/daemon/manager.h b/daemon/manager.h index 4bf8f98..45ba50a 100644 --- a/daemon/manager.h +++ b/daemon/manager.h @@ -11,12 +11,14 @@ #include <QtContacts/QContactManager> #include <QtContacts/QContactDetailFilter> #include <MNotification> +#include "Logger" using namespace QtContacts; class Manager : public QObject { Q_OBJECT + LOG4QT_DECLARE_QCLASS_LOGGER friend class PebbledProxy; |