From b36e22c6cdfbe79b0d91aff2746df5e962f80a33 Mon Sep 17 00:00:00 2001
From: Tomasz Sterna <tomek@xiaoka.com>
Date: Mon, 28 Jul 2014 16:06:12 +0200
Subject: Removed Log4Qt from sources

Depend on externally provided liblog4qt.so.1
---
 daemon/daemon.cpp            | 9 ++-------
 daemon/daemon.pro            | 9 ++-------
 daemon/dbusconnector.h       | 2 +-
 daemon/manager.h             | 2 +-
 daemon/notificationmanager.h | 2 +-
 daemon/voicecallhandler.h    | 2 +-
 daemon/voicecallmanager.h    | 2 +-
 daemon/watchcommands.h       | 2 +-
 daemon/watchconnector.h      | 2 +-
 9 files changed, 11 insertions(+), 21 deletions(-)

(limited to 'daemon')

diff --git a/daemon/daemon.cpp b/daemon/daemon.cpp
index e075c0c..520e8f2 100644
--- a/daemon/daemon.cpp
+++ b/daemon/daemon.cpp
@@ -34,13 +34,8 @@
 #include <QFile>
 #include <QDir>
 #include <QFileInfo>
-
-#include "LogManager"
-#include "SystemlogAppender"
-#include "FileAppender"
-#include "helpers/factory.h"
-#include "Appender"
-#include "PropertyConfigurator"
+#include <Log4Qt/LogManager>
+#include <Log4Qt/PropertyConfigurator>
 
 void signalhandler(int sig)
 {
diff --git a/daemon/daemon.pro b/daemon/daemon.pro
index df7b887..bc0c2e7 100644
--- a/daemon/daemon.pro
+++ b/daemon/daemon.pro
@@ -8,9 +8,7 @@ QT += bluetooth dbus contacts
 PKGCONFIG += mlite5
 QMAKE_CXXFLAGS += -std=c++0x
 
-LIBS += -L$$OUT_PWD/../ext/Log4Qt/ -llog4qt
-QMAKE_RPATHDIR += /usr/share/pebble/lib
-INCLUDEPATH += ../ext/Log4Qt/src ../ext/Log4Qt/deploy/include
+LIBS += -llog4qt
 
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"
 
@@ -41,7 +39,7 @@ OTHER_FILES += \
     ../log4qt-debug.conf \
     ../log4qt-release.conf
 
-INSTALLS += target pebbled confile lib
+INSTALLS += target pebbled confile
 
 target.path = /usr/bin
 
@@ -60,8 +58,5 @@ else {
 confile.files = $$OUT_PWD/../log4qt.conf
 confile.path = /usr/share/pebble
 
-lib.files += $$OUT_PWD/../ext/Log4Qt/*.s*
-lib.path = /usr/share/pebble/lib
-
 # unnecesary includes, just so QtCreator could find headers... :-(
 INCLUDEPATH += $$[QT_HOST_PREFIX]/include/mlite5
diff --git a/daemon/dbusconnector.h b/daemon/dbusconnector.h
index 4498867..7141cab 100644
--- a/daemon/dbusconnector.h
+++ b/daemon/dbusconnector.h
@@ -4,7 +4,7 @@
 #include <QObject>
 #include <QStringList>
 #include <QVariantMap>
-#include "Logger"
+#include <Log4Qt/Logger>
 
 class DBusConnector : public QObject
 {
diff --git a/daemon/manager.h b/daemon/manager.h
index 4a55256..a062388 100644
--- a/daemon/manager.h
+++ b/daemon/manager.h
@@ -14,7 +14,7 @@
 #include <QtContacts/QContactManager>
 #include <QtContacts/QContactDetailFilter>
 #include <MNotification>
-#include "Logger"
+#include <Log4Qt/Logger>
 
 using namespace QtContacts;
 
diff --git a/daemon/notificationmanager.h b/daemon/notificationmanager.h
index 4695db9..10c4d2e 100644
--- a/daemon/notificationmanager.h
+++ b/daemon/notificationmanager.h
@@ -2,7 +2,7 @@
 #define NOTIFICATIONMANAGER_H
 
 #include <QObject>
-#include "Logger"
+#include <Log4Qt/Logger>
 #include "settings.h"
 
 #include <QDBusInterface>
diff --git a/daemon/voicecallhandler.h b/daemon/voicecallhandler.h
index bd0d71d..4ad0157 100644
--- a/daemon/voicecallhandler.h
+++ b/daemon/voicecallhandler.h
@@ -4,7 +4,7 @@
 #include <QObject>
 #include <QDateTime>
 #include <QDBusPendingCallWatcher>
-#include "Logger"
+#include <Log4Qt/Logger>
 
 class VoiceCallHandler : public QObject
 {
diff --git a/daemon/voicecallmanager.h b/daemon/voicecallmanager.h
index afb9a11..c078e68 100644
--- a/daemon/voicecallmanager.h
+++ b/daemon/voicecallmanager.h
@@ -6,7 +6,7 @@
 #include <QObject>
 #include <QDBusInterface>
 #include <QDBusPendingCallWatcher>
-#include "Logger"
+#include <Log4Qt/Logger>
 
 class VoiceCallProviderData
 {
diff --git a/daemon/watchcommands.h b/daemon/watchcommands.h
index 4bd8f3d..8626b7c 100644
--- a/daemon/watchcommands.h
+++ b/daemon/watchcommands.h
@@ -2,7 +2,7 @@
 #define WATCHCOMMANDS_H
 
 #include "watchconnector.h"
-#include "Logger"
+#include <Log4Qt/Logger>
 
 #include <QObject>
 
diff --git a/daemon/watchconnector.h b/daemon/watchconnector.h
index deb4894..63391d8 100644
--- a/daemon/watchconnector.h
+++ b/daemon/watchconnector.h
@@ -37,7 +37,7 @@
 #include <QBluetoothDeviceInfo>
 #include <QBluetoothSocket>
 #include <QBluetoothServiceInfo>
-#include "Logger"
+#include <Log4Qt/Logger>
 
 using namespace QtBluetooth;
 
-- 
cgit v1.2.3