diff options
| author | Philipp Andreas <github@smurfy.de> | 2014-07-20 22:25:45 +0200 |
|---|---|---|
| committer | Philipp Andreas <github@smurfy.de> | 2014-07-20 23:21:05 +0200 |
| commit | c9c1ed9faee07c0067827872ffe465d465c81470 (patch) | |
| tree | 91b87b5ad63956bda1254cb4b083f3fc8d6551e4 /ext/Log4Qt/Log4Qt.pro | |
| parent | 9bbba72939248388dfc832a5bf20cb9539ab0675 (diff) | |
| parent | c47315faa12bbb36772c3f5897751bf74fa122f4 (diff) | |
Merge branch 'master' into notifications
Conflicts:
daemon/daemon.cpp
daemon/manager.cpp
daemon/manager.h
ext/Log4Qt
Diffstat (limited to 'ext/Log4Qt/Log4Qt.pro')
| -rw-r--r-- | ext/Log4Qt/Log4Qt.pro | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/ext/Log4Qt/Log4Qt.pro b/ext/Log4Qt/Log4Qt.pro deleted file mode 100644 index 65700d2..0000000 --- a/ext/Log4Qt/Log4Qt.pro +++ /dev/null @@ -1,21 +0,0 @@ - -include(src/Log4Qt.pri) - -TEMPLATE = lib -QT += core xml network -TARGET = log4qt - -LOG4QT_VERSION_MAJOR = 1 -LOG4QT_VERSION_MINOR = 1 -LOG4QT_VERSION_RELEASE = 0 - -LOG4QT_VERSION = '\\"$${LOG4QT_VERSION_MAJOR}.$${LOG4QT_VERSION_MINOR}.$${LOG4QT_VERSION_RELEASE}\\"' -DEFINES += LOG4QT_VERSION_STR=\"$${LOG4QT_VERSION}\" -DEFINES += LOG4QT_VERSION=$${LOG4QT_VERSION} - -VERSION = 1.1.0 - -DEPENDPATH += src src/helpers src/spisrc/ varia -INCLUDEPATH += src src/helpers src/spi src/varia - - |