diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | daemon/daemon.cpp | 9 | ||||
| -rw-r--r-- | daemon/daemon.pro | 9 | ||||
| -rw-r--r-- | daemon/dbusconnector.h | 2 | ||||
| -rw-r--r-- | daemon/manager.h | 2 | ||||
| -rw-r--r-- | daemon/notificationmanager.h | 2 | ||||
| -rw-r--r-- | daemon/voicecallhandler.h | 2 | ||||
| -rw-r--r-- | daemon/voicecallmanager.h | 2 | ||||
| -rw-r--r-- | daemon/watchcommands.h | 2 | ||||
| -rw-r--r-- | daemon/watchconnector.h | 2 | ||||
| m--------- | ext/Log4Qt | 0 | ||||
| -rw-r--r-- | ext/ext.pro | 4 | ||||
| -rw-r--r-- | pebble.pro | 3 | ||||
| -rw-r--r-- | rpm/pebble.spec | 1 | ||||
| -rw-r--r-- | rpm/pebble.yaml | 3 |
15 files changed, 14 insertions, 32 deletions
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 99ea068..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "ext/Log4Qt"] - path = ext/Log4Qt - url = git@github.com:smokku/Log4Qt.git 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; diff --git a/ext/Log4Qt b/ext/Log4Qt deleted file mode 160000 -Subproject be6d5df0c29dad3f5a5c43cd91c780627b3c64f diff --git a/ext/ext.pro b/ext/ext.pro deleted file mode 100644 index b1879b1..0000000 --- a/ext/ext.pro +++ /dev/null @@ -1,4 +0,0 @@ -# Such a project structure allowed for integrating Log4Qt via git subtree -# Log4Qt folder is pulled right from the remote repository -TEMPLATE = subdirs -SUBDIRS = Log4Qt @@ -1,6 +1,5 @@ TEMPLATE = subdirs -CONFIG += ordered -SUBDIRS = ext daemon app +SUBDIRS = daemon app OTHER_FILES += \ README.md \ rpm/pebble.spec \ diff --git a/rpm/pebble.spec b/rpm/pebble.spec index 71d5d46..d9ea363 100644 --- a/rpm/pebble.spec +++ b/rpm/pebble.spec @@ -83,6 +83,5 @@ systemctl --user daemon-reload %{_libdir}/systemd/user/%{name}d.service %{_libdir}/systemd/user/user-session.target.wants/%{name}d.service %{_datadir}/%{name}/log4qt.conf -%{_datadir}/%{name}/lib # >> files # << files diff --git a/rpm/pebble.yaml b/rpm/pebble.yaml index 4934f05..c52804a 100644 --- a/rpm/pebble.yaml +++ b/rpm/pebble.yaml @@ -22,6 +22,8 @@ PkgConfigBR: - Qt5Core - mlite5 - sailfishapp >= 0.0.10 +PkgBR: +- log4qt-devel Requires: - sailfishsilica-qt5 >= 0.10.9 - systemd-user-session-targets @@ -33,5 +35,4 @@ Files: - '%{_libdir}/systemd/user/%{name}d.service' - '%{_libdir}/systemd/user/user-session.target.wants/%{name}d.service' - '%{_datadir}/%{name}/log4qt.conf' -- '%{_datadir}/%{name}/lib' PkgBR: [] |