23 files changed, 34 insertions, 36 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 220c7d3..4cba967 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ if(BUILD_WITH_COVERAGE)
     include(${CMAKE_SOURCE_DIR}/cmake/lcov.cmake)
 endif()
 
-add_subdirectory(src)
+add_subdirectory(libqmenumodel)
 
 # Tests Tools
 if(NOT DBUS_RUNNER)
diff --git a/libqmenumodel/CMakeLists.txt b/libqmenumodel/CMakeLists.txt
new file mode 100644
index 0000000..d01cf10
--- /dev/null
+++ b/libqmenumodel/CMakeLists.txt
@@ -0,0 +1,4 @@
+project(libqmenumodel)
+
+add_subdirectory(src)
+add_subdirectory(QMenuModel)
diff --git a/src/QMenuModel/CMakeLists.txt b/libqmenumodel/QMenuModel/CMakeLists.txt
index bf3bb5a..891c89c 100644
--- a/src/QMenuModel/CMakeLists.txt
+++ b/libqmenumodel/QMenuModel/CMakeLists.txt
@@ -1,26 +1,25 @@
+project(qmlplugin)
 
-project(qmenumodelqmlplugin)
-
-set(QMENUMODEL_SRC
+set(QMLPLUGIN_SRC
     plugin.cpp
 )
 
-set(QMENUMODEL_HEADERS
+set(QMLPLUGIN_HEADERS
     plugin.h
 )
 
-qt4_wrap_cpp(QMENUMODEL_MOC
-    ${QMENUMODEL_HEADERS}
+qt4_wrap_cpp(QMLPLUGIN_MOC
+    ${QMLPLUGIN_HEADERS}
 )
 
-add_library(qmenumodel MODULE
-    ${QMENUMODEL_SRC}
-    ${QMENUMODEL_MOC}
+add_library(qmenumodel-qml MODULE
+    ${QMLPLUGIN_SRC}
+    ${QMLPLUGIN_MOC}
 )
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${qmenumodelcommon_SOURCE_DIR}
+    ${src_SOURCE_DIR}
     ${QT_INCLUDE_DIR}
     ${QT_QTCORE_INCLUDE_DIR}
     ${QT_QTGUI_INCLUDE_DIR}
@@ -29,10 +28,9 @@ include_directories(
     ${GIO_INCLUDE_DIRS}
 )
 
-target_link_libraries(qmenumodel
-    qmenumodelcommon
+target_link_libraries(qmenumodel-qml
+    qmenumodel
     ${QT_QTCORE_LIBRARY}
-    ${QT_QTGUI_LIBRARY}
     ${QT_QTDCLARATIVE_LIBRARY}
     ${GLIB_LDFLAGS}
     ${GIO_LDFLAGS}
@@ -41,6 +39,7 @@ target_link_libraries(qmenumodel
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
                                                               "${CMAKE_CURRENT_BINARY_DIR}/qmldir")
 
-set(QMENUMODEL_INSTALL_PREFIX "${QT_IMPORTS_DIR}/Ubuntu/QMenuModel/")
-install(TARGETS qmenumodel DESTINATION ${QMENUMODEL_INSTALL_PREFIX})
-install(FILES qmldir DESTINATION ${QMENUMODEL_INSTALL_PREFIX})
+set(QMLPLUGIN_INSTALL_PREFIX "${QT_IMPORTS_DIR}/Ubuntu/QMenuModel/")
+install(TARGETS qmenumodel-qml DESTINATION ${QMLPLUGIN_INSTALL_PREFIX})
+install(FILES qmldir DESTINATION ${QMLPLUGIN_INSTALL_PREFIX})
+
diff --git a/src/QMenuModel/plugin.cpp b/libqmenumodel/QMenuModel/plugin.cpp
index ec51ae9..ec51ae9 100644
--- a/src/QMenuModel/plugin.cpp
+++ b/libqmenumodel/QMenuModel/plugin.cpp
diff --git a/src/QMenuModel/plugin.h b/libqmenumodel/QMenuModel/plugin.h
index e9d6850..e9d6850 100644
--- a/src/QMenuModel/plugin.h
+++ b/libqmenumodel/QMenuModel/plugin.h
diff --git a/libqmenumodel/QMenuModel/qmldir b/libqmenumodel/QMenuModel/qmldir
new file mode 100644
index 0000000..32de804
--- /dev/null
+++ b/libqmenumodel/QMenuModel/qmldir
@@ -0,0 +1 @@
+plugin qmenumodel-qml
diff --git a/src/common/CMakeLists.txt b/libqmenumodel/src/CMakeLists.txt
index 2b831b7..17d11f1 100644
--- a/src/common/CMakeLists.txt
+++ b/libqmenumodel/src/CMakeLists.txt
@@ -1,6 +1,6 @@
-project(qmenumodelcommon)
+project(src)
 
-set(QMENUMODELCOMMON_SRC
+set(QMENUMODEL_SRC
     converter.cpp
     qmenumodel.cpp
     qdbusobject.cpp
@@ -9,7 +9,7 @@ set(QMENUMODELCOMMON_SRC
     qstateaction.cpp
 )
 
-set(QMENUMODELCOMMON_HEADERS
+set(QMENUMODEL_HEADERS
     converter.h
     dbus-enums.h
     qmenumodel.h
@@ -19,16 +19,16 @@ set(QMENUMODELCOMMON_HEADERS
     qstateaction.h
 )
 
-qt4_wrap_cpp(QMENUMODELCOMMON_MOC
-    ${QMENUMODELCOMMON_HEADERS}
+qt4_wrap_cpp(QMENUMODEL_MOC
+    ${QMENUMODEL_HEADERS}
 )
 
-add_library(qmenumodelcommon STATIC
-    ${QMENUMODELCOMMON_SRC}
-    ${QMENUMODELCOMMON_MOC}
+add_library(qmenumodel STATIC
+    ${QMENUMODEL_SRC}
+    ${QMENUMODEL_MOC}
 )
 
-set_target_properties(qmenumodelcommon PROPERTIES COMPILE_FLAGS -fPIC)
+set_target_properties(qmenumodel PROPERTIES COMPILE_FLAGS -fPIC)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
@@ -39,9 +39,8 @@ include_directories(
     ${GIO_INCLUDE_DIRS}
 )
 
-target_link_libraries(qmenumodelcommon
+target_link_libraries(qmenumodel
     ${QT_QTCORE_LIBRARY}
-    ${QT_QTGUI_LIBRARY}
     ${GLIB_LDFLAGS}
     ${GIO_LDFLAGS}
 )
diff --git a/src/common/converter.cpp b/libqmenumodel/src/converter.cpp
index a060618..a060618 100644
--- a/src/common/converter.cpp
+++ b/libqmenumodel/src/converter.cpp
diff --git a/src/common/converter.h b/libqmenumodel/src/converter.h
index 5f05bc7..5f05bc7 100644
--- a/src/common/converter.h
+++ b/libqmenumodel/src/converter.h
diff --git a/src/common/dbus-enums.h b/libqmenumodel/src/dbus-enums.h
index 76149da..76149da 100644
--- a/src/common/dbus-enums.h
+++ b/libqmenumodel/src/dbus-enums.h
diff --git a/src/common/qdbusactiongroup.cpp b/libqmenumodel/src/qdbusactiongroup.cpp
index 5a9e0bd..5a9e0bd 100644
--- a/src/common/qdbusactiongroup.cpp
+++ b/libqmenumodel/src/qdbusactiongroup.cpp
diff --git a/src/common/qdbusactiongroup.h b/libqmenumodel/src/qdbusactiongroup.h
index 518f78c..518f78c 100644
--- a/src/common/qdbusactiongroup.h
+++ b/libqmenumodel/src/qdbusactiongroup.h
diff --git a/src/common/qdbusmenumodel.cpp b/libqmenumodel/src/qdbusmenumodel.cpp
index 88a6084..88a6084 100644
--- a/src/common/qdbusmenumodel.cpp
+++ b/libqmenumodel/src/qdbusmenumodel.cpp
diff --git a/src/common/qdbusmenumodel.h b/libqmenumodel/src/qdbusmenumodel.h
index fdf23f7..fdf23f7 100644
--- a/src/common/qdbusmenumodel.h
+++ b/libqmenumodel/src/qdbusmenumodel.h
diff --git a/src/common/qdbusobject.cpp b/libqmenumodel/src/qdbusobject.cpp
index abc68b4..abc68b4 100644
--- a/src/common/qdbusobject.cpp
+++ b/libqmenumodel/src/qdbusobject.cpp
diff --git a/src/common/qdbusobject.h b/libqmenumodel/src/qdbusobject.h
index ef2b42f..ef2b42f 100644
--- a/src/common/qdbusobject.h
+++ b/libqmenumodel/src/qdbusobject.h
diff --git a/src/common/qmenumodel.cpp b/libqmenumodel/src/qmenumodel.cpp
index e88bc66..e88bc66 100644
--- a/src/common/qmenumodel.cpp
+++ b/libqmenumodel/src/qmenumodel.cpp
diff --git a/src/common/qmenumodel.h b/libqmenumodel/src/qmenumodel.h
index 7520480..7520480 100644
--- a/src/common/qmenumodel.h
+++ b/libqmenumodel/src/qmenumodel.h
diff --git a/src/common/qstateaction.cpp b/libqmenumodel/src/qstateaction.cpp
index 3629fce..3629fce 100644
--- a/src/common/qstateaction.cpp
+++ b/libqmenumodel/src/qstateaction.cpp
diff --git a/src/common/qstateaction.h b/libqmenumodel/src/qstateaction.h
index 1a5a0fa..1a5a0fa 100644
--- a/src/common/qstateaction.h
+++ b/libqmenumodel/src/qstateaction.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
deleted file mode 100644
index 7215efc..0000000
--- a/src/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-project(src)
-
-add_subdirectory(common)
-add_subdirectory(QMenuModel)
diff --git a/src/QMenuModel/qmldir b/src/QMenuModel/qmldir
deleted file mode 100644
index c8f525f..0000000
--- a/src/QMenuModel/qmldir
+++ /dev/null
@@ -1 +0,0 @@
-plugin qmenumodel
diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt
index c427f54..2c48a07 100644
--- a/tests/client/CMakeLists.txt
+++ b/tests/client/CMakeLists.txt
@@ -4,7 +4,7 @@ macro(declare_test testname)
 
     add_executable(${testname} ${testname}.cpp ${TEST_MOC_FILE})
     target_link_libraries(${testname}
-                          qmenumodelcommon
+                          qmenumodel
                           dbusmenuscript
                           ${QT_QTTEST_LIBRARY}
                           ${QT_QTCORE_LIBRARY}
@@ -30,7 +30,7 @@ macro(declare_simple_test testname)
 
     add_executable(${testname} ${testname}.cpp ${TEST_MOC_FILE})
     target_link_libraries(${testname}
-                          qmenumodelcommon
+                          qmenumodel
                           ${QT_QTTEST_LIBRARY}
                           ${QT_QTCORE_LIBRARY}
                           ${QT_QTGUI_LIBRARY}
@@ -45,7 +45,7 @@ macro(declare_simple_test testname)
                          TIMEOUT ${CTEST_TESTING_TIMEOUT})
 endmacro(declare_simple_test testname)
 
-include_directories(${qmenumodelcommon_SOURCE_DIR}
+include_directories(${src_SOURCE_DIR}
                     ${dbusmenuscript_SOURCE_DIR}
                     ${CMAKE_CURRENT_BINARY_DIR}
                     ${QT_INCLUDE_DIR}