Merge branch 'master' into notifications

Conflicts:
	daemon/manager.cpp

1 files changed, 51 insertions, 0 deletions

diff --git a/ext/Log4Qt/Readme.txt b/ext/Log4Qt/Readme.txt
new file mode 100644
index 0000000..61ddd8f
--- /dev/null
+++ b/ext/Log4Qt/Readme.txt
@@ -0,0 +1,51 @@
+Build and install
+
+*NIX
+  STATIC
+    cmake -DQT_USE_QTSQL=TRUE -DQT_USE_QTNETWORK=TRUE -DCMAKE_BUILD_TYPE=Release -DLOG4QT_BUILD_STATIC=True .
+    make
+    make install
+  SHARED
+    cmake -DQT_USE_QTSQL=TRUE -DQT_USE_QTNETWORK=TRUE -DCMAKE_BUILD_TYPE=Release .
+    make
+    make install
+
+WIN*
+  STATIC
+    cmake -DQT_USE_QTSQL=TRUE -DQT_USE_QTNETWORK=TRUE -DCMAKE_BUILD_TYPE=Release -G "MinGW Makefiles" -DLOG4QT_BUILD_STATIC=True .
+    mingw32-make
+    mingw32-make install
+  SHARED
+    cmake -DQT_USE_QTSQL=TRUE -DQT_USE_QTNETWORK=TRUE -DCMAKE_BUILD_TYPE=Release -G "MinGW Makefiles" .
+    mingw32-make
+    mingw32-make install
+
+If you dont want to use log4qt sql features you must not define QT_USE_QTSQL.
+If you dont want to use log4qt network features you must not define QT_USE_QTNETWORK.
+
+Using in your projects
+
+If your have cmake-based project
+  for shared linking you must:
+    1. make log4qt in shared mode;
+    2. install it;
+    1. add log4qt package to your CMakeLists.txt;
+    2. include header directory;
+    3. link library to target.
+    
+    For example:
+    find_package(log4qt REQUIRED HINTS "${QT_MKSPECS_DIR}/cmake/Log4Qt" NO_DEFAULT_PATHS)
+    include_directories(${LOG4QT_INCLUDE_DIRS})
+    target_link_libraries(main ${QT_LIBRARIES} log4qt)
+
+  for static linking:
+    1. add subdirectory to your project
+    2. include log4qt/src
+    3. link library to target
+    
+    For example:
+    add_subdirectory(../log4qt ${CMAKE_CURRENT_BINARY_DIR}/log4qt)
+    include_directories(../log4qt/src)
+    target_link_libraries(main ${QT_LIBRARIES} log4qt)
+
+