summaryrefslogtreecommitdiff
path: root/daemon
diff options
context:
space:
mode:
authorTomasz Sterna <tomek@xiaoka.com>2014-07-20 21:48:03 +0200
committerTomasz Sterna <tomek@xiaoka.com>2014-07-20 21:48:03 +0200
commite8ad1c9c993a98cdeea92dfcec29052654ec807d (patch)
tree2fa459215dac4aa9e58f97865d17ffbe05f48630 /daemon
parentcfd11bb46b0e93903135c127b955e657d7f2b33d (diff)
Added VERSION to app and daemon
Diffstat (limited to 'daemon')
-rw-r--r--daemon/daemon.cpp4
-rw-r--r--daemon/daemon.pro2
2 files changed, 4 insertions, 2 deletions
diff --git a/daemon/daemon.cpp b/daemon/daemon.cpp
index b891680..6fa634c 100644
--- a/daemon/daemon.cpp
+++ b/daemon/daemon.cpp
@@ -70,8 +70,6 @@ void initLogging()
Log4Qt::LogManager::setHandleQtMessages(true);
qDebug() << "Using following log config file: " << usedConfigFile;
-
- Log4Qt::Logger::logger(QLatin1String("Main Logger"))->info("Logging started");
}
int main(int argc, char *argv[])
@@ -82,6 +80,8 @@ int main(int argc, char *argv[])
// QCoreApplication for determining the .conf files locations
initLogging();
+ Log4Qt::Logger::logger(QLatin1String("Main Logger"))->info() << argv[0] << APP_VERSION;
+
watch::WatchConnector watch;
DBusConnector dbus;
VoiceCallManager voice;
diff --git a/daemon/daemon.pro b/daemon/daemon.pro
index cf6d5b9..d77be1a 100644
--- a/daemon/daemon.pro
+++ b/daemon/daemon.pro
@@ -12,6 +12,8 @@ LIBS += -L$$OUT_PWD/../ext/Log4Qt/ -llog4qt
QMAKE_RPATHDIR += /usr/share/pebble/lib
INCLUDEPATH += ../ext/Log4Qt/src ../ext/Log4Qt/deploy/include
+DEFINES += APP_VERSION=\\\"$$VERSION\\\"
+
SOURCES += \
daemon.cpp \
manager.cpp \