Merge branch 'kyoto'

Conflicts:
	common/storage.h
	common/storage_lmdb.cpp
	dummyresource/facade.cpp
	store/test/CMakeLists.txt
	tests/storagebenchmark.cpp

1 files changed, 0 insertions, 22 deletions

diff --git a/store/test/CMakeLists.txt b/store/test/CMakeLists.txt
deleted file mode 100644
index c5c4fcb..0000000
--- a/store/test/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-set(store_path "../")
-set(store_SRCS
-    ${store_path}/database.cpp
-)
-
-generate_flatbuffers(calendar)
-
-macro(manual_tests)
-    foreach(_testname ${ARGN})
-        add_executable(${_testname} ${_testname}.cpp ${store_SRCS})
-        qt5_use_modules(${_testname} Core Test Concurrent)
-        target_link_libraries(${_testname} lmdb)
-    endforeach(_testname)
-endmacro(auto_tests)
-
-manual_tests (
-    storagebenchmark
-    storagetest
-)