Merge pull request #15 from nemomobile/staging

Moving qtaround to the separate repository

.gitignore

@@ -21,3 +21,6 @@ examples/use_cutes
 src/vault-cli
 units/vault-*
 *.moc
+tests/tests.xml
+tests/*_unit.cpp
+tests/*_vault_test

CMakeLists.txt

@@ -41,19 +41,32 @@ set(CMAKE_CXX_FLAGS
   "${CMAKE_CXX_FLAGS} -gdwarf-3"
   )
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/src)
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/src
+)
+
+pkg_check_modules(QTAROUND qtaround REQUIRED)
+pkg_check_modules(COR cor REQUIRED)
+include_directories(
+  ${COR_INCLUDE_DIRS}
+  ${QTAROUND_INCLUDE_DIRS}
+)
+link_directories(
+  ${COR_LIBRARY_DIRS}
+  ${QTAROUND_LIBRARY_DIRS}
+)
+
 add_subdirectory(src)
 add_subdirectory(examples)
 add_subdirectory(tests)
 add_subdirectory(qml/Vault)
 
 configure_file(vault-unit.pc.in vault-unit.pc @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/vault-unit.pc DESTINATION ${DST_LIB}/pkgconfig)
-configure_file(qtaround.pc.in qtaround.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qtaround.pc DESTINATION ${DST_LIB}/pkgconfig)
 
 install(
-  DIRECTORY include/vault include/qtaround
+  DIRECTORY include/vault
   DESTINATION include
   FILES_MATCHING
   PATTERN "*.hpp"

examples/test_cutes.cpp

@@ -7,6 +7,12 @@
 #include <QCoreApplication>
 #include <QDebug>
 
+namespace os = qtaround::os;
+namespace error = qtaround::error;
+namespace sys = qtaround::sys;
+namespace json = qtaround::json;
+namespace debug = qtaround::debug;
+
 int main(int argc, char *argv[])
 {
     QCoreApplication app(argc, argv);