2 files changed, 14 insertions, 5 deletions

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index a0ebe3a..8001d5f 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -3,12 +3,15 @@ project(akonadi2_client)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 set(akonadi2client_SRCS
-    main.cpp
     resourceaccess.cpp
 )
 
-add_executable(${PROJECT_NAME} ${akonadi2client_SRCS})
-target_link_libraries(${PROJECT_NAME} akonadi2common)
+add_library(${PROJECT_NAME}_lib ${akonadi2client_SRCS})
+target_link_libraries(${PROJECT_NAME}_lib akonadi2common)
+qt5_use_modules(${PROJECT_NAME}_lib Widgets Network)
+
+add_executable(${PROJECT_NAME} main.cpp)
+target_link_libraries(${PROJECT_NAME} akonadi2_client_lib akonadi2common)
 qt5_use_modules(${PROJECT_NAME} Widgets Network)
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)
 
diff --git a/client/clientapi.h b/client/clientapi.h
index 59efe32..592fa48 100644
--- a/client/clientapi.h
+++ b/client/clientapi.h
@@ -185,8 +185,14 @@ using namespace async;
 class Query
 {
 public:
-    //Resources to search
-    QSet<QString> resources;
+    //Could also be a propertyFilter
+    QStringList resources;
+    //Could also be a propertyFilter
+    QStringList ids;
+    //Filters to apply
+    QHash<QString, QVariant> propertyFilter;
+    //Properties to retrieve
+    QSet<QString> requestedProperties;
 };