File akonadi-804508.diff of Package akonadi-runtime

Overview Repositories Revisions Requests Users Attributes Meta

File akonadi-804508.diff of Package akonadi-runtime (Revision 19dbd3833df3428bd9f65cc8dee2c1ce)

Currently displaying revision 19dbd3833df3428bd9f65cc8dee2c1ce , Show latest

--- cmake/modules/AkonadiInternal.cmake	
+++ cmake/modules/AkonadiInternal.cmake	
@@ -1,165 +0,0 @@
-# Copyright (c) 2008 Kevin Krammer <kevin.krammer@gmx.at>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-include(FindQt4)
-include(KDE4Macros)
-include(MacroAdditionalCleanFiles)
-include(MacroLogFeature)
-
-set (EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
-
-   if (WIN32)
-      set(LIBRARY_OUTPUT_PATH            ${EXECUTABLE_OUTPUT_PATH} )
-      # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
-      set(KDE4_AUTOMOC_EXECUTABLE        ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc )
-      set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
-   else (WIN32)
-      set(LIBRARY_OUTPUT_PATH            ${CMAKE_BINARY_DIR}/lib )
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell )
-      set(KDE4_AUTOMOC_EXECUTABLE        ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc )
-      set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell )
-   endif (WIN32)
-
-   # when building, make automoc depend on the executable...
-   set( _KDE4_AUTOMOC_EXECUTABLE_DEP kde4automoc)
-
-if (WIN32)
-# use relative install prefix to avoid hardcoded install paths in cmake_install.cmake files
-
-   set(LIB_INSTALL_DIR      "lib${LIB_SUFFIX}" )            # The subdirectory relative to the install prefix where libraries will be installed (default is ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX})
-
-   set(EXEC_INSTALL_PREFIX  "" )        # Base directory for executables and libraries
-   set(SHARE_INSTALL_PREFIX "share" )   # Base directory for files which go to share/
-   set(BIN_INSTALL_DIR      "bin"   )   # The install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)
-   set(SBIN_INSTALL_DIR     "sbin"  )   # The install dir for system executables (default ${EXEC_INSTALL_PREFIX}/sbin)
-
-   set(LIBEXEC_INSTALL_DIR  "${BIN_INSTALL_DIR}"          ) # The subdirectory relative to the install prefix where libraries will be installed (default is ${BIN_INSTALL_DIR})
-   set(INCLUDE_INSTALL_DIR  "include"                     ) # The subdirectory to the header prefix
-
-   set(PLUGIN_INSTALL_DIR       "lib${LIB_SUFFIX}/kde4"   ) #                "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde4)
-   set(CONFIG_INSTALL_DIR       "share/config"            ) # The config file install dir
-   set(DATA_INSTALL_DIR         "share/apps"              ) # The parent directory where applications can install their data
-   set(HTML_INSTALL_DIR         "share/doc/HTML"          ) # The HTML install dir for documentation
-   set(ICON_INSTALL_DIR         "share/icons"             ) # The icon install dir (default ${SHARE_INSTALL_PREFIX}/share/icons/)
-   set(KCFG_INSTALL_DIR         "share/config.kcfg"       ) # The install dir for kconfig files
-   set(LOCALE_INSTALL_DIR       "share/locale"            ) # The install dir for translations
-   set(MIME_INSTALL_DIR         "share/mimelnk"           ) # The install dir for the mimetype desktop files
-   set(SERVICES_INSTALL_DIR     "share/kde4/services"     ) # The install dir for service (desktop, protocol, ...) files
-   set(SERVICETYPES_INSTALL_DIR "share/kde4/servicetypes" ) # The install dir for servicestypes desktop files
-   set(SOUND_INSTALL_DIR        "share/sounds"            ) # The install dir for sound files
-   set(TEMPLATES_INSTALL_DIR    "share/templates"         ) # The install dir for templates (Create new file...)
-   set(WALLPAPER_INSTALL_DIR    "share/wallpapers"        ) # The install dir for wallpapers
-   set(DEMO_INSTALL_DIR         "share/demos"             ) # The install dir for demos
-   set(KCONF_UPDATE_INSTALL_DIR "share/apps/kconf_update" ) # The kconf_update install dir
-   set(AUTOSTART_INSTALL_DIR    "share/autostart"         ) # The install dir for autostart files
-
-   set(XDG_APPS_INSTALL_DIR      "share/applications/kde4"   ) # The XDG apps dir
-   set(XDG_DIRECTORY_INSTALL_DIR "share/desktop-directories" ) # The XDG directory
-   set(XDG_MIME_INSTALL_DIR      "share/mime/packages"       ) # The install dir for the xdg mimetypes
-
-   set(SYSCONF_INSTALL_DIR       "etc"                       ) # The kde sysconfig install dir (default /etc)
-   set(MAN_INSTALL_DIR           "share/man"                 ) # The kde man install dir (default ${SHARE_INSTALL_PREFIX}/man/)
-   set(INFO_INSTALL_DIR          "share/info"                ) # The kde info install dir (default ${SHARE_INSTALL_PREFIX}/info)")
-   set(DBUS_INTERFACES_INSTALL_DIR "share/dbus-1/interfaces" ) # The kde dbus interfaces install dir (default  ${SHARE_INSTALL_PREFIX}/dbus-1/interfaces)")
-   set(DBUS_SERVICES_INSTALL_DIR "share/dbus-1/services"     ) # The kde dbus services install dir (default  ${SHARE_INSTALL_PREFIX}/dbus-1/services)")
-
-else (WIN32)
-
-   # this macro implements some very special logic how to deal with the cache
-   # by default the various install locations inherit their value from theit "parent" variable
-   # so if you set CMAKE_INSTALL_PREFIX, then EXEC_INSTALL_PREFIX, PLUGIN_INSTALL_DIR will
-   # calculate their value by appending subdirs to CMAKE_INSTALL_PREFIX
-   # this would work completely without using the cache.
-   # but if somebody wants e.g. a different EXEC_INSTALL_PREFIX this value has to go into
-   # the cache, otherwise it will be forgotten on the next cmake run.
-   # Once a variable is in the cache, it doesn't depend on its "parent" variables
-   # anymore and you can only change it by editing it directly.
-   # this macro helps in this regard, because as long as you don't set one of the
-   # variables explicitely to some location, it will always calculate its value from its
-   # parents. So modifying CMAKE_INSTALL_PREFIX later on will have the desired effect.
-   # But once you decide to set e.g. EXEC_INSTALL_PREFIX to some special location
-   # this will go into the cache and it will no longer depend on CMAKE_INSTALL_PREFIX.
-   #
-   # additionally if installing to the same location as kdelibs, the other install
-   # directories are reused from the installed kdelibs
-   macro(_SET_FANCY _var _value _comment)
-      set(predefinedvalue "${_value}")
-      if ("${CMAKE_INSTALL_PREFIX}" STREQUAL "${KDE4_INSTALL_DIR}" AND DEFINED KDE4_${_var})
-         set(predefinedvalue "${KDE4_${_var}}")
-      endif ("${CMAKE_INSTALL_PREFIX}" STREQUAL "${KDE4_INSTALL_DIR}" AND DEFINED KDE4_${_var})
-
-      if (NOT DEFINED ${_var})
-         set(${_var} ${predefinedvalue})
-      else (NOT DEFINED ${_var})
-         set(${_var} "${${_var}}" CACHE PATH "${_comment}")
-      endif (NOT DEFINED ${_var})
-   endmacro(_SET_FANCY)
-
-
-   _set_fancy(EXEC_INSTALL_PREFIX  "${CMAKE_INSTALL_PREFIX}"                 "Base directory for executables and libraries")
-   _set_fancy(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share"           "Base directory for files which go to share/")
-   _set_fancy(BIN_INSTALL_DIR      "${EXEC_INSTALL_PREFIX}/bin"              "The install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)")
-   _set_fancy(SBIN_INSTALL_DIR     "${EXEC_INSTALL_PREFIX}/sbin"             "The install dir for system executables (default ${EXEC_INSTALL_PREFIX}/sbin)")
-   _set_fancy(LIB_INSTALL_DIR      "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" "The subdirectory relative to the install prefix where libraries will be installed (default is ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX})")
-   _set_fancy(LIBEXEC_INSTALL_DIR  "${LIB_INSTALL_DIR}/kde4/libexec"         "The subdirectory relative to the install prefix where libraries will be installed (default is ${LIB_INSTALL_DIR}/kde4/libexec)")
-   _set_fancy(INCLUDE_INSTALL_DIR  "${CMAKE_INSTALL_PREFIX}/include"         "The subdirectory to the header prefix")
-
-   _set_fancy(PLUGIN_INSTALL_DIR       "${LIB_INSTALL_DIR}/kde4"                "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde4)")
-   _set_fancy(CONFIG_INSTALL_DIR       "${SHARE_INSTALL_PREFIX}/config"         "The config file install dir")
-   _set_fancy(DATA_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/apps"           "The parent directory where applications can install their data")
-   _set_fancy(HTML_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/doc/HTML"       "The HTML install dir for documentation")
-   _set_fancy(ICON_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/icons"          "The icon install dir (default ${SHARE_INSTALL_PREFIX}/share/icons/)")
-   _set_fancy(KCFG_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/config.kcfg"    "The install dir for kconfig files")
-   _set_fancy(LOCALE_INSTALL_DIR       "${SHARE_INSTALL_PREFIX}/locale"         "The install dir for translations")
-   _set_fancy(MIME_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/mimelnk"        "The install dir for the mimetype desktop files")
-   _set_fancy(SERVICES_INSTALL_DIR     "${SHARE_INSTALL_PREFIX}/kde4/services"  "The install dir for service (desktop, protocol, ...) files")
-   _set_fancy(SERVICETYPES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/kde4/servicetypes" "The install dir for servicestypes desktop files")
-   _set_fancy(SOUND_INSTALL_DIR        "${SHARE_INSTALL_PREFIX}/sounds"         "The install dir for sound files")
-   _set_fancy(TEMPLATES_INSTALL_DIR    "${SHARE_INSTALL_PREFIX}/templates"      "The install dir for templates (Create new file...)")
-   _set_fancy(WALLPAPER_INSTALL_DIR    "${SHARE_INSTALL_PREFIX}/wallpapers"     "The install dir for wallpapers")
-   _set_fancy(DEMO_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/demos"          "The install dir for demos")
-   _set_fancy(KCONF_UPDATE_INSTALL_DIR "${DATA_INSTALL_DIR}/kconf_update"       "The kconf_update install dir")
-   _set_fancy(AUTOSTART_INSTALL_DIR    "${SHARE_INSTALL_PREFIX}/autostart"      "The install dir for autostart files")
-
-   _set_fancy(XDG_APPS_INSTALL_DIR     "${SHARE_INSTALL_PREFIX}/applications/kde4"         "The XDG apps dir")
-   _set_fancy(XDG_DIRECTORY_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/desktop-directories"      "The XDG directory")
-   _set_fancy(XDG_MIME_INSTALL_DIR     "${SHARE_INSTALL_PREFIX}/mime/packages"  "The install dir for the xdg mimetypes")
-
-   _set_fancy(SYSCONF_INSTALL_DIR      "${CMAKE_INSTALL_PREFIX}/etc"            "The kde sysconfig install dir (default ${CMAKE_INSTALL_PREFIX}/etc)")
-   _set_fancy(MAN_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/man"            "The kde man install dir (default ${SHARE_INSTALL_PREFIX}/man/)")
-   _set_fancy(INFO_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/info"           "The kde info install dir (default ${SHARE_INSTALL_PREFIX}/info)")
-   _set_fancy(DBUS_INTERFACES_INSTALL_DIR      "${SHARE_INSTALL_PREFIX}/dbus-1/interfaces" "The kde dbus interfaces install dir (default  ${SHARE_INSTALL_PREFIX}/dbus-1/interfaces)")
-   _set_fancy(DBUS_SERVICES_INSTALL_DIR      "${SHARE_INSTALL_PREFIX}/dbus-1/services"     "The kde dbus services install dir (default  ${SHARE_INSTALL_PREFIX}/dbus-1/services)")
-
-endif (WIN32)
-
-# The INSTALL_TARGETS_DEFAULT_ARGS variable should be used when libraries are installed.
-# The arguments are also ok for regular executables, i.e. executables which don't go
-# into sbin/ or libexec/, but for installing executables the basic syntax 
-# INSTALL(TARGETS kate DESTINATION "${BIN_INSTALL_DIR}")
-# is enough, so using this variable there doesn't help a lot.
-# The variable must not be used for installing plugins.
-# Usage is like this:
-#    install(TARGETS kdecore kdeui ${INSTALL_TARGETS_DEFAULT_ARGS} )
-#
-# This will install libraries correctly under UNIX, OSX and Windows (i.e. dll's go
-# into bin/.
-# Later on it will be possible to extend this for installing OSX frameworks
-# The COMPONENT Devel argument has the effect that static libraries belong to the 
-# "Devel" install component. If we use this also for all install() commands
-# for header files, it will be possible to install
-#   -everything: make install OR cmake -P cmake_install.cmake
-#   -only the development files: cmake -DCOMPONENT=Devel -P cmake_install.cmake
-#   -everything except the development files: cmake -DCOMPONENT=Unspecified -P cmake_install.cmake
-# This can then also be used for packaging with cpack.
-
-set(INSTALL_TARGETS_DEFAULT_ARGS  RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
-                                  LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
-                                  ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT Devel )
-
-
--- cmake/modules/kde4_exec_via_sh.cmake	
+++ cmake/modules/kde4_exec_via_sh.cmake	
@@ -1,31 +0,0 @@
-
-# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-if (UNIX)
-
-file(WRITE "${_filename}" 
-"#!/bin/sh
-# created by cmake, don't edit, changes will be lost
-
-${_library_path_variable}=${_ld_library_path}\${${_library_path_variable}:+:\$${_library_path_variable}} \"${_executable}\" \"$@\"
-")
-
-# make it executable
-# since this is only executed on UNIX, it is safe to call chmod
-exec_program(chmod ARGS ug+x \"${_filename}\" OUTPUT_VARIABLE _dummy )
-
-else (UNIX)
-
-file(TO_NATIVE_PATH "${_ld_library_path}" win_path)
-
-file(WRITE "${_filename}" 
-"
-set PATH=${win_path};$ENV{PATH}
-\"${_executable}\" %*
-")
-
-endif (UNIX)
--- cmake/modules/kde4automoc.files.in	
+++ cmake/modules/kde4automoc.files.in	
@@ -1,4 +0,0 @@
-MOC_INCLUDES:
-@_moc_incs@
-SOURCES:
-@_moc_files@
--- cmake/modules/KDE4Macros.cmake	
+++ cmake/modules/KDE4Macros.cmake	
@@ -1,1131 +0,0 @@
-# for documentation look at FindKDE4Internal.cmake
-
-# this file contains the following macros:
-# KDE4_ADD_UI_FILES
-# KDE4_ADD_UI3_FILES
-# KDE4_ADD_KCFG_FILES
-# KDE4_SET_CUSTOM_TARGET_PROPERTY
-# KDE4_GET_CUSTOM_TARGET_PROPERTY
-# KDE4_MOC_HEADERS
-# KDE4_HANDLE_AUTOMOC
-# KDE4_CREATE_FINAL_FILES
-# KDE4_ADD_PLUGIN
-# KDE4_ADD_KDEINIT_EXECUTABLE
-# KDE4_ADD_UNIT_TEST
-# KDE4_ADD_EXECUTABLE
-# KDE4_ADD_WIDGET_FILES
-# KDE4_UPDATE_ICONCACHE
-# KDE4_INSTALL_ICONS
-# KDE4_REMOVE_OBSOLETE_CMAKE_FILES
-# KDE4_NO_ENABLE_FINAL
-# KDE4_CREATE_HANDBOOK
-# KDE4_ADD_APP_ICON
-# KDE4_CREATE_MANPAGE
-
-# Copyright (c) 2006, 2007, Alexander Neundorf, <neundorf@kde.org>
-# Copyright (c) 2006, 2007, Laurent Montel, <montel@kde.org>
-# Copyright (c) 2007 Matthias Kretz <kretz@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-macro (KDE4_ADD_KCFG_FILES _sources )
-   if( ${ARGV1} STREQUAL "GENERATE_MOC" )
-      set(_kcfg_generatemoc TRUE)
-   endif( ${ARGV1} STREQUAL "GENERATE_MOC" )
-
-   foreach (_current_FILE ${ARGN})
-
-     if(NOT ${_current_FILE} STREQUAL "GENERATE_MOC")
-       get_filename_component(_tmp_FILE ${_current_FILE} ABSOLUTE)
-       get_filename_component(_abs_PATH ${_tmp_FILE} PATH)
-       get_filename_component(_basename ${_tmp_FILE} NAME_WE)
-
-       file(READ ${_tmp_FILE} _contents)
-       string(REGEX REPLACE "^(.*\n)?File=([^\n]+kcfg).*\n.*$" "\\2"  _kcfg_FILE "${_contents}")
-       set(_src_FILE    ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
-       set(_header_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h)
-       set(_moc_FILE    ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc)
-
-       # the command for creating the source file from the kcfg file
-       add_custom_command(OUTPUT ${_header_FILE} ${_src_FILE}
-          COMMAND ${KDE4_KCFGC_EXECUTABLE}
-          ARGS ${_abs_PATH}/${_kcfg_FILE} ${_tmp_FILE} -d ${CMAKE_CURRENT_BINARY_DIR}
-          MAIN_DEPENDENCY ${_tmp_FILE}
-          DEPENDS ${_abs_PATH}/${_kcfg_FILE} ${_KDE4_KCONFIG_COMPILER_DEP} )
-
-       if(_kcfg_generatemoc)
-         qt4_generate_moc(${_header_FILE} ${_moc_FILE} )
-         set_source_files_properties(${_src_FILE} PROPERTIES SKIP_AUTOMOC TRUE)  # don't run automoc on this file
-         list(APPEND ${_sources} ${_moc_FILE})
-       endif(_kcfg_generatemoc)
-
-       list(APPEND ${_sources} ${_src_FILE} ${_header_FILE})
-     endif(NOT ${_current_FILE} STREQUAL "GENERATE_MOC")
-   endforeach (_current_FILE)
-
-endmacro (KDE4_ADD_KCFG_FILES)
-
-
-GET_FILENAME_COMPONENT(KDE4_MODULE_DIR  ${CMAKE_CURRENT_LIST_FILE} PATH)
-
-#create the implementation files from the ui files and add them to the list of sources
-#usage: KDE4_ADD_UI_FILES(foo_SRCS ${ui_files})
-macro (KDE4_ADD_UI_FILES _sources )
-   foreach (_current_FILE ${ARGN})
-
-      get_filename_component(_tmp_FILE ${_current_FILE} ABSOLUTE)
-      get_filename_component(_basename ${_tmp_FILE} NAME_WE)
-      set(_header ${CMAKE_CURRENT_BINARY_DIR}/ui_${_basename}.h)
-
-      # we need to run uic and replace some things in the generated file
-      # this is done by executing the cmake script kde4uic.cmake
-      add_custom_command(OUTPUT ${_header}
-         COMMAND ${CMAKE_COMMAND}
-         ARGS
-         -DKDE4_HEADER:BOOL=ON
-         -DKDE_UIC_EXECUTABLE:FILEPATH=${QT_UIC_EXECUTABLE}
-         -DKDE_UIC_FILE:FILEPATH=${_tmp_FILE}
-         -DKDE_UIC_H_FILE:FILEPATH=${_header}
-         -DKDE_UIC_BASENAME:STRING=${_basename}
-         -P ${KDE4_MODULE_DIR}/kde4uic.cmake
-         MAIN_DEPENDENCY ${_tmp_FILE}
-      )
-      list(APPEND ${_sources} ${_header})
-   endforeach (_current_FILE)
-endmacro (KDE4_ADD_UI_FILES)
-
-
-#create the implementation files from the ui files and add them to the list of sources
-#usage: KDE4_ADD_UI3_FILES(foo_SRCS ${ui_files})
-macro (KDE4_ADD_UI3_FILES _sources )
-
-   qt4_get_moc_inc_dirs(_moc_INCS)
-
-   foreach (_current_FILE ${ARGN})
-
-      get_filename_component(_tmp_FILE ${_current_FILE} ABSOLUTE)
-      get_filename_component(_basename ${_tmp_FILE} NAME_WE)
-      set(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h)
-      set(_src ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
-      set(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc.cpp)
-
-      add_custom_command(OUTPUT ${_header}
-         COMMAND ${CMAKE_COMMAND}
-         -DKDE3_HEADER:BOOL=ON
-         -DKDE_UIC_EXECUTABLE:FILEPATH=${QT_UIC3_EXECUTABLE}
-         -DKDE_UIC_FILE:FILEPATH=${_tmp_FILE}
-         -DKDE_UIC_H_FILE:FILEPATH=${_header}
-         -DKDE_UIC_BASENAME:STRING=${_basename}
-         -DKDE_UIC_PLUGIN_DIR:FILEPATH="."
-         -P ${KDE4_MODULE_DIR}/kde4uic.cmake
-         MAIN_DEPENDENCY ${_tmp_FILE}
-      )
-
-# we need to run uic3 and replace some things in the generated file
-      # this is done by executing the cmake script kde4uic.cmake
-      add_custom_command(OUTPUT ${_src}
-         COMMAND ${CMAKE_COMMAND}
-         ARGS
-         -DKDE3_IMPL:BOOL=ON
-         -DKDE_UIC_EXECUTABLE:FILEPATH=${QT_UIC3_EXECUTABLE}
-         -DKDE_UIC_FILE:FILEPATH=${_tmp_FILE}
-         -DKDE_UIC_CPP_FILE:FILEPATH=${_src}
-         -DKDE_UIC_H_FILE:FILEPATH=${_header}
-         -DKDE_UIC_BASENAME:STRING=${_basename}
-         -DKDE_UIC_PLUGIN_DIR:FILEPATH="."
-         -P ${KDE4_MODULE_DIR}/kde4uic.cmake
-         MAIN_DEPENDENCY ${_header}
-      )
-
-      add_custom_command(OUTPUT ${_moc}
-         COMMAND ${QT_MOC_EXECUTABLE}
-         ARGS ${_moc_INCS} ${_header} -o ${_moc}
-         MAIN_DEPENDENCY ${_header}
-      )
-      list(APPEND ${_sources} ${_src} ${_moc} )
-
-   endforeach (_current_FILE)
-endmacro (KDE4_ADD_UI3_FILES)
-
-macro (KDE4_SET_CUSTOM_TARGET_PROPERTY _target_name _property_name _property)
-   string(REGEX REPLACE "[/ ]" "_" _dir "${CMAKE_CURRENT_SOURCE_DIR}")
-   set(_kde4_${_dir}_${_target_name}_${_property_name} "${_property}")
-endmacro (KDE4_SET_CUSTOM_TARGET_PROPERTY)
-
-
-macro (KDE4_GET_CUSTOM_TARGET_PROPERTY _var _target_name _property_name)
-   string(REGEX REPLACE "[/ ]" "_" _dir "${CMAKE_CURRENT_SOURCE_DIR}")
-   set(${_var} "${_kde4_${_dir}_${_target_name}_${_property_name}}")
-endmacro (KDE4_GET_CUSTOM_TARGET_PROPERTY)
-
-
-macro (KDE4_MOC_HEADERS _target_NAME)
-   set (_headers_to_moc)
-   foreach (_current_FILE ${ARGN})
-      get_filename_component(_suffix "${_current_FILE}" EXT)
-      if (".h" STREQUAL "${_suffix}" OR ".hpp" STREQUAL "${_suffix}" OR ".hxx" STREQUAL "${_suffix}" OR ".H" STREQUAL "${_suffix}")
-         list(APPEND _headers_to_moc ${_current_FILE})
-      else (".h" STREQUAL "${_suffix}" OR ".hpp" STREQUAL "${_suffix}" OR ".hxx" STREQUAL "${_suffix}" OR ".H" STREQUAL "${_suffix}")
-         message(STATUS "KDE4_MOC_HEADERS: ignoring non-header file ${_current_FILE}")
-      endif (".h" STREQUAL "${_suffix}" OR ".hpp" STREQUAL "${_suffix}" OR ".hxx" STREQUAL "${_suffix}" OR ".H" STREQUAL "${_suffix}")
-   endforeach (_current_FILE)
-   # need to create moc_<filename>.cpp file using kde4automoc.cmake
-   # and add it to the target
-   if(_headers_to_moc)
-      kde4_set_custom_target_property(${_target_NAME} AUTOMOC_HEADERS "${_headers_to_moc}")
-   endif(_headers_to_moc)
-endmacro (KDE4_MOC_HEADERS)
-
-macro(KDE4_HANDLE_AUTOMOC _target_NAME _SRCS)
-   set(_moc_files)
-   set(_moc_headers)
-
-   # first list all explicitly set headers
-   kde4_get_custom_target_property(_headers_to_moc ${_target_NAME} AUTOMOC_HEADERS)
-   if(NOT _headers_to_moc STREQUAL "NOTFOUND")
-      foreach(_header_to_moc ${_headers_to_moc})
-         get_filename_component(_abs_header ${_header_to_moc} ABSOLUTE)
-         list(APPEND _moc_files ${_abs_header})
-         list(APPEND _moc_headers ${_abs_header})
-      endforeach(_header_to_moc)
-   endif(NOT _headers_to_moc STREQUAL "NOTFOUND")
-
-   # now add all the sources for the automoc
-   foreach (_current_FILE ${${_SRCS}})
-      get_filename_component(_abs_current_FILE "${_current_FILE}" ABSOLUTE)
-      get_source_file_property(_skip "${_abs_current_FILE}" SKIP_AUTOMOC)
-      get_source_file_property(_generated "${_abs_current_FILE}" GENERATED)
-
-      if(NOT _generated AND NOT _skip)
-         get_filename_component(_suffix "${_current_FILE}" EXT)
-         # skip every source file that's not C++
-         if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C")
-            get_filename_component(_basename "${_current_FILE}" NAME_WE)
-            get_filename_component(_abs_path "${_abs_current_FILE}" PATH)
-            set(_header "${_abs_path}/${_basename}.h")
-            if(EXISTS "${_header}")
-               list(APPEND _moc_headers ${_header})
-            endif(EXISTS "${_header}")
-            set(_pheader "${_abs_path}/${_basename}_p.h")
-            if(EXISTS "${_pheader}")
-               list(APPEND _moc_headers ${_pheader})
-            endif(EXISTS "${_pheader}")
-            list(APPEND _moc_files ${_abs_current_FILE})
-         endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C")
-      endif(NOT _generated AND NOT _skip)
-   endforeach (_current_FILE)
-
-   if(_moc_files)
-      set(_automoc_source "${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_automoc.cpp")
-      get_directory_property(_moc_incs INCLUDE_DIRECTORIES)
-      configure_file(${KDE4_MODULE_DIR}/kde4automoc.files.in ${_automoc_source}.files)
-      add_custom_command(OUTPUT ${_automoc_source}
-         COMMAND ${KDE4_AUTOMOC_EXECUTABLE}
-         ${_automoc_source}
-         ${CMAKE_CURRENT_SOURCE_DIR}
-         ${CMAKE_CURRENT_BINARY_DIR}
-         ${QT_MOC_EXECUTABLE}
-         DEPENDS ${${_SRCS}} ${_moc_headers} ${_automoc_source}.files ${_KDE4_AUTOMOC_EXECUTABLE_DEP}
-         )
-      # the OBJECT_DEPENDS is only necessary when a new moc file has to be generated that is included in a source file
-      # problem: the whole target is recompiled when the automoc.cpp file is touched
-      # set_source_files_properties(${${_SRCS}} PROPERTIES OBJECT_DEPENDS ${_automoc_source})
-      set(${_SRCS} ${_automoc_source} ${${_SRCS}})
-   endif(_moc_files)
-endmacro(KDE4_HANDLE_AUTOMOC)
-
-macro(KDE4_INSTALL_TS_FILES _lang _sdir)
-   file(GLOB_RECURSE _ts_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${_sdir}/*)
-   foreach(_current_TS_FILES ${_ts_files})
-      string(REGEX MATCH "\\.svn/" _in_svn ${_current_TS_FILES})
-      if(NOT _in_svn)
-         get_filename_component(_subpath ${_current_TS_FILES} PATH)
-         install(FILES ${_current_TS_FILES} DESTINATION ${LOCALE_INSTALL_DIR}/${_lang}/LC_SCRIPTS/${_subpath})
-      endif(NOT _in_svn)
-   endforeach(_current_TS_FILES)
-endmacro(KDE4_INSTALL_TS_FILES)
-
-macro (KDE4_INSTALL_HANDBOOK _lang)
-   message(STATUS "KDE4_INSTALL_HANDBOOK() is deprecated. Remove it please. Now all is done in KDE4_CREATE_HANDBOOK.")
-endmacro (KDE4_INSTALL_HANDBOOK )
-
-
-macro (KDE4_CREATE_HANDBOOK _docbook)
-   get_filename_component(_input ${_docbook} ABSOLUTE)
-   set(_doc ${CMAKE_CURRENT_BINARY_DIR}/index.cache.bz2)
-
-   #Bootstrap
-   if (_kdeBootStrapping)
-      set(_ssheet ${CMAKE_SOURCE_DIR}/kdoctools/customization/kde-chunk.xsl)
-      set(_bootstrapOption "--srcdir=${CMAKE_SOURCE_DIR}/kdoctools/")
-   else (_kdeBootStrapping)
-      set(_ssheet ${KDE4_DATA_INSTALL_DIR}/ksgmltools2/customization/kde-chunk.xsl)
-      set(_bootstrapOption)
-   endif (_kdeBootStrapping)
-
-   file(GLOB _docs *.docbook)
-   add_custom_command(OUTPUT ${_doc}
-      COMMAND ${KDE4_MEINPROC_EXECUTABLE} --check ${_bootstrapOption} --cache ${_doc} ${_input}
-      DEPENDS ${_docs} ${_KDE4_MEINPROC_EXECUTABLE_DEP} ${_ssheet}
-      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-   )
-   get_filename_component(_targ ${CMAKE_CURRENT_SOURCE_DIR} NAME)
-   set(_targ "${_targ}-handbook")
-   add_custom_target(${_targ} ALL DEPENDS ${_doc})
-
-   if(KDE4_ENABLE_HTMLHANDBOOK)
-      set(_htmlDoc ${CMAKE_CURRENT_SOURCE_DIR}/index.html)
-      add_custom_command(OUTPUT ${_htmlDoc}
-         COMMAND ${KDE4_MEINPROC_EXECUTABLE} --check ${_bootstrapOption} -o ${_htmlDoc} ${_input}
-         DEPENDS ${_input} ${_KDE4_MEINPROC_EXECUTABLE_DEP} ${_ssheet}
-         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-      )
-      add_custom_target(htmlhandbook DEPENDS ${_htmlDoc})
-   endif(KDE4_ENABLE_HTMLHANDBOOK)
-
-   set(_args ${ARGN})
-
-   set(_installDest)
-   if(_args)
-      list(GET _args 0 _tmp)
-      if("${_tmp}" STREQUAL "INSTALL_DESTINATION")
-         list(GET _args 1 _installDest )
-         list(REMOVE_AT _args 0 1)
-      endif("${_tmp}" STREQUAL "INSTALL_DESTINATION")
-   endif(_args)
-
-   get_filename_component(dirname ${CMAKE_CURRENT_SOURCE_DIR} NAME_WE)
-   if(_args)
-      list(GET _args 0 _tmp)
-      if("${_tmp}" STREQUAL "SUBDIR")
-         list(GET _args 1 dirname )
-         list(REMOVE_AT _args 0 1)
-      endif("${_tmp}" STREQUAL "SUBDIR")
-   endif(_args)
-
-   if(_installDest)
-      file(GLOB _images *.png)
-      install(FILES ${_doc} ${_docs} ${_images} DESTINATION ${_installDest}/${dirname})
-      # TODO symlinks on non-unix platforms
-      if (UNIX)
-         # execute some cmake code on make install which creates the symlink
-         install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${_installDest}/common\"  \"\$ENV{DESTDIR}${_installDest}/${dirname}/common\" )" )
-      endif (UNIX)
-   endif(_installDest)
-
-endmacro (KDE4_CREATE_HANDBOOK)
-
-
-macro (KDE4_CREATE_MANPAGE _docbook _section)
-   get_filename_component(_input ${_docbook} ABSOLUTE)
-   get_filename_component(_base ${_input} NAME_WE)
-
-   set(_doc ${CMAKE_CURRENT_BINARY_DIR}/${_base}.${_section})
-   # sometimes we have "man-" prepended
-   string(REGEX REPLACE "/man-" "/" _outdoc ${_doc})
-
-   #Bootstrap
-   if (_kdeBootStrapping)
-      set(_ssheet "${CMAKE_SOURCE_DIR}/kdoctools/docbook/xsl/manpages/docbook.xsl")
-      set(_bootstrapOption "--srcdir=${CMAKE_SOURCE_DIR}/kdoctools/")
-   else (_kdeBootStrapping)
-      set(_ssheet "${KDE4_DATA_INSTALL_DIR}/ksgmltools2/docbook/xsl/manpages/docbook.xsl")
-      set(_bootstrapOption)
-   endif (_kdeBootStrapping)
-
-   add_custom_command(OUTPUT ${_outdoc}
-      COMMAND ${KDE4_MEINPROC_EXECUTABLE} --stylesheet ${_ssheet} --check ${_bootstrapOption} ${_input}
-      DEPENDS ${_input} ${_KDE4_MEINPROC_EXECUTABLE_DEP} ${_ssheet}
-   )
-   get_filename_component(_targ ${CMAKE_CURRENT_SOURCE_DIR} NAME)
-   set(_targ "${_targ}-manpage")
-   add_custom_target(${_targ} ALL DEPENDS "${_outdoc}")
-
-   set(_args ${ARGN})
-
-   set(_installDest)
-   if(_args)
-      list(GET _args 0 _tmp)
-      if("${_tmp}" STREQUAL "INSTALL_DESTINATION")
-         list(GET _args 1 _installDest )
-         list(REMOVE_AT _args 0 1)
-      endif("${_tmp}" STREQUAL "INSTALL_DESTINATION")
-   endif(_args)
-
-   get_filename_component(dirname ${CMAKE_CURRENT_SOURCE_DIR} NAME_WE)
-   if(_args)
-      list(GET _args 0 _tmp)
-      if("${_tmp}" STREQUAL "SUBDIR")
-         list(GET _args 1 dirname )
-         list(REMOVE_AT _args 0 1)
-      endif("${_tmp}" STREQUAL "SUBDIR")
-   endif(_args)
-
-   if(_installDest)
-      install(FILES ${_outdoc} DESTINATION ${_installDest}/man${_section})
-   endif(_installDest)
-endmacro (KDE4_CREATE_MANPAGE)
-
-
-macro (KDE4_UPDATE_ICONCACHE)
-    # Update mtime of hicolor icon theme dir.
-    # We don't always have touch command (e.g. on Windows), so instead create
-    #  and delete a temporary file in the theme dir.
-   install(CODE "
-    set(DESTDIR_VALUE \"\$ENV{DESTDIR}\")
-    if (NOT DESTDIR_VALUE)
-        file(WRITE \"${ICON_INSTALL_DIR}/hicolor/temp.txt\" \"update\")
-        file(REMOVE \"${ICON_INSTALL_DIR}/hicolor/temp.txt\")
-    endif (NOT DESTDIR_VALUE)
-    ")
-endmacro (KDE4_UPDATE_ICONCACHE)
-
-# a "map" of short type names to the directories
-# unknown names should give empty results
-# KDE 3 compatibility
-set(_KDE4_ICON_GROUP_mime       "mimetypes")
-set(_KDE4_ICON_GROUP_filesys    "places")
-set(_KDE4_ICON_GROUP_device     "devices")
-set(_KDE4_ICON_GROUP_app        "apps")
-set(_KDE4_ICON_GROUP_action     "actions")
-# KDE 4 / icon naming specification compatibility
-set(_KDE4_ICON_GROUP_mimetypes  "mimetypes")
-set(_KDE4_ICON_GROUP_places     "places")
-set(_KDE4_ICON_GROUP_devices    "devices")
-set(_KDE4_ICON_GROUP_apps       "apps")
-set(_KDE4_ICON_GROUP_actions    "actions")
-set(_KDE4_ICON_GROUP_categories "categories")
-set(_KDE4_ICON_GROUP_status     "status")
-set(_KDE4_ICON_GROUP_emblems    "emblems")
-set(_KDE4_ICON_GROUP_emotes     "emotes")
-set(_KDE4_ICON_GROUP_animations "animations")
-set(_KDE4_ICON_GROUP_intl       "intl")
-
-# a "map" of short theme names to the theme directory
-set(_KDE4_ICON_THEME_ox "oxygen")
-set(_KDE4_ICON_THEME_cr "crystalsvg")
-set(_KDE4_ICON_THEME_lo "locolor")
-set(_KDE4_ICON_THEME_hi "hicolor")
-
-
-# only used internally by KDE4_INSTALL_ICONS
-macro (_KDE4_ADD_ICON_INSTALL_RULE _install_SCRIPT _install_PATH _group _orig_NAME _install_NAME _l10n_SUBDIR)
-
-   # if the string doesn't match the pattern, the result is the full string, so all three have the same content
-   if (NOT ${_group} STREQUAL ${_install_NAME} )
-      set(_icon_GROUP  ${_KDE4_ICON_GROUP_${_group}})
-      if(NOT _icon_GROUP)
-         set(_icon_GROUP "actions")
-      endif(NOT _icon_GROUP)
-#      message(STATUS "icon: ${_current_ICON} size: ${_size} group: ${_group} name: ${_name} l10n: ${_l10n_SUBDIR}")
-      install(FILES ${_orig_NAME} DESTINATION ${_install_PATH}/${_icon_GROUP}/${_l10n_SUBDIR}/ RENAME ${_install_NAME} )
-   endif (NOT ${_group} STREQUAL ${_install_NAME} )
-
-endmacro (_KDE4_ADD_ICON_INSTALL_RULE)
-
-
-macro (KDE4_INSTALL_ICONS _defaultpath )
-
-   # the l10n-subdir if language given as second argument (localized icon)
-   set(_lang ${ARGV1})
-   if(_lang)
-      set(_l10n_SUBDIR l10n/${_lang})
-   else(_lang)
-      set(_l10n_SUBDIR ".")
-   endif(_lang)
-
-   # first the png icons
-   file(GLOB _icons *.png)
-   foreach (_current_ICON ${_icons} )
-      string(REGEX REPLACE "^.*/([a-zA-Z]+)([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\1" _type  "${_current_ICON}")
-      string(REGEX REPLACE "^.*/([a-zA-Z]+)([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\2" _size  "${_current_ICON}")
-      string(REGEX REPLACE "^.*/([a-zA-Z]+)([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\3" _group "${_current_ICON}")
-      string(REGEX REPLACE "^.*/([a-zA-Z]+)([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\4" _name  "${_current_ICON}")
-
-      set(_theme_GROUP ${_KDE4_ICON_THEME_${_type}})
-      if( _theme_GROUP)
-         _KDE4_ADD_ICON_INSTALL_RULE(${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
-                    ${_defaultpath}/${_theme_GROUP}/${_size}x${_size}
-                    ${_group} ${_current_ICON} ${_name} ${_l10n_SUBDIR})
-      endif( _theme_GROUP)
-   endforeach (_current_ICON)
-
-   # mng icons
-   file(GLOB _icons *.mng)
-   foreach (_current_ICON ${_icons} )
-      STRING(REGEX REPLACE "^.*/([a-zA-Z]+)([0-9]+)\\-([a-z]+)\\-(.+\\.mng)$" "\\1" _type  "${_current_ICON}")
-      STRING(REGEX REPLACE "^.*/([a-zA-Z]+)([0-9]+)\\-([a-z]+)\\-(.+\\.mng)$" "\\2" _size  "${_current_ICON}")
-      STRING(REGEX REPLACE "^.*/([a-zA-Z]+)([0-9]+)\\-([a-z]+)\\-(.+\\.mng)$" "\\3" _group "${_current_ICON}")
-      STRING(REGEX REPLACE "^.*/([a-zA-Z]+)([0-9]+)\\-([a-z]+)\\-(.+\\.mng)$" "\\4" _name  "${_current_ICON}")
-
-      set(_theme_GROUP ${_KDE4_ICON_THEME_${_type}})
-      if( _theme_GROUP)
-         _KDE4_ADD_ICON_INSTALL_RULE(${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
-                ${_defaultpath}/${_theme_GROUP}/${_size}x${_size}
-                ${_group} ${_current_ICON} ${_name} ${_l10n_SUBDIR})
-      endif( _theme_GROUP)
-   endforeach (_current_ICON)
-
-   # and now the svg icons
-   file(GLOB _icons *.svgz)
-   foreach (_current_ICON ${_icons} )
-      STRING(REGEX REPLACE "^.*/([a-zA-Z]+)sc\\-([a-z]+)\\-(.+\\.svgz)$" "\\1" _type "${_current_ICON}")
-      STRING(REGEX REPLACE "^.*/([a-zA-Z]+)sc\\-([a-z]+)\\-(.+\\.svgz)$" "\\2" _group "${_current_ICON}")
-      STRING(REGEX REPLACE "^.*/([a-zA-Z]+)sc\\-([a-z]+)\\-(.+\\.svgz)$" "\\3" _name "${_current_ICON}")
-
-      set(_theme_GROUP ${_KDE4_ICON_THEME_${_type}})
-      if( _theme_GROUP)
-          _KDE4_ADD_ICON_INSTALL_RULE(${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
-                            ${_defaultpath}/${_theme_GROUP}/scalable
-                            ${_group} ${_current_ICON} ${_name} ${_l10n_SUBDIR})
-      endif( _theme_GROUP)
-   endforeach (_current_ICON)
-
-   KDE4_UPDATE_ICONCACHE()
-
-endmacro (KDE4_INSTALL_ICONS)
-
-
-# For all C++ sources a big source file which includes all the files
-# is created.
-# This is not done for the C sources, they are just gathered in a separate list
-# because they are usually not written by KDE and as such not intended to be
-# compiled all-in-one.
-macro (KDE4_CREATE_FINAL_FILES _filenameCPP _filesExcludedFromFinalFile )
-   set(${_filesExcludedFromFinalFile})
-   file(WRITE "${_filenameCPP}" "//autogenerated file\n")
-   foreach (_current_FILE ${ARGN})
-      get_filename_component(_abs_FILE "${_current_FILE}" ABSOLUTE)
-      # don't include any generated files in the final-file
-      # because then cmake will not know the dependencies
-      get_source_file_property(_isGenerated "${_abs_FILE}" GENERATED)
-      if (_isGenerated)
-         list(APPEND ${_filesExcludedFromFinalFile} "${_abs_FILE}")
-      else (_isGenerated)
-         # only put C++ files in the final-file
-         if("${_abs_FILE}" MATCHES ".+\\.(cpp|cc|cxx|C)$")
-            file(APPEND "${_filenameCPP}" "#include \"${_abs_FILE}\"\n")
-         else("${_abs_FILE}" MATCHES ".+\\.(cpp|cc|cxx|C)$")
-            list(APPEND ${_filesExcludedFromFinalFile} "${_abs_FILE}")
-         endif("${_abs_FILE}" MATCHES ".+\\.(cpp|cc|cxx|C)$")
-      endif (_isGenerated)
-   endforeach (_current_FILE)
-
-endmacro (KDE4_CREATE_FINAL_FILES)
-
-# This macro sets the RPATH related options for libraries, plugins and kdeinit executables.
-# It overrides the defaults set in FindKDE4Internal.cmake.
-# If RPATH is not explicitly disabled, libraries and plugins are built without RPATH, in
-# the hope that the RPATH which is compiled into the executable is good enough.
-macro (KDE4_HANDLE_RPATH_FOR_LIBRARY _target_NAME)
-   if (NOT CMAKE_SKIP_RPATH)
-      if(KDE4_USE_ALWAYS_FULL_RPATH)
-         set_target_properties(${_target_NAME} PROPERTIES  SKIP_BUILD_RPATH FALSE  BUILD_WITH_INSTALL_RPATH FALSE)
-      else(KDE4_USE_ALWAYS_FULL_RPATH)
-         set_target_properties(${_target_NAME} PROPERTIES  INSTALL_RPATH_USE_LINK_PATH FALSE  SKIP_BUILD_RPATH TRUE  BUILD_WITH_INSTALL_RPATH TRUE  INSTALL_RPATH "")
-      endif(KDE4_USE_ALWAYS_FULL_RPATH)
-   endif (NOT CMAKE_SKIP_RPATH)
-endmacro (KDE4_HANDLE_RPATH_FOR_LIBRARY)
-
-# This macro sets the RPATH related options for executables
-# and creates wrapper shell scripts for the executables.
-# It overrides the defaults set in FindKDE4Internal.cmake.
-# For every executable a wrapper script is created, which sets the appropriate
-# environment variable for the platform (LD_LIBRARY_PATH on most UNIX systems,
-# DYLD_LIBRARY_PATH on OS X and PATH in Windows) so  that it points to the built
-# but not yet installed versions of the libraries. So if RPATH is disabled, the executables
-# can be run via these scripts from the build tree and will find the correct libraries.
-# If RPATH is not disabled, these scripts are also used but only for consistency, because
-# they don't really influence anything then, because the compiled-in RPATH overrides
-# the LD_LIBRARY_PATH env. variable.
-# Executables with the RUN_UNINSTALLED option will be built with the RPATH pointing to the
-# build dir, so that they can be run safely without being installed, e.g. as code generators
-# for other stuff during the build. These executables will be relinked during "make install".
-# All other executables are built with the RPATH with which they will be installed.
-macro (KDE4_HANDLE_RPATH_FOR_EXECUTABLE _target_NAME _type)
-   if (UNIX)
-
-      # set the RPATH related properties
-      if (NOT CMAKE_SKIP_RPATH)
-         if (${_type} STREQUAL "GUI")
-            set_target_properties(${_target_NAME} PROPERTIES  SKIP_BUILD_RPATH TRUE  BUILD_WITH_INSTALL_RPATH TRUE)
-         endif (${_type} STREQUAL "GUI")
-
-         if (${_type} STREQUAL "NOGUI")
-            set_target_properties(${_target_NAME} PROPERTIES  SKIP_BUILD_RPATH TRUE  BUILD_WITH_INSTALL_RPATH TRUE)
-         endif (${_type} STREQUAL "NOGUI")
-
-         if (${_type} STREQUAL "RUN_UNINSTALLED")
-            set_target_properties(${_target_NAME} PROPERTIES  SKIP_BUILD_RPATH FALSE  BUILD_WITH_INSTALL_RPATH FALSE)
-         endif (${_type} STREQUAL "RUN_UNINSTALLED")
-      endif (NOT CMAKE_SKIP_RPATH)
-
-      if (APPLE)
-         set(_library_path_variable "DYLD_LIBRARY_PATH")
-      else (APPLE)
-         set(_library_path_variable "LD_LIBRARY_PATH")
-      endif (APPLE)
-
-      if (APPLE)
-         # DYLD_LIBRARY_PATH does not work like LD_LIBRARY_PATH
-         # OSX already has the RPATH in libraries and executables, putting runtime directories in
-         # DYLD_LIBRARY_PATH actually breaks things
-         set(_ld_library_path "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/:${KDE4_LIB_DIR}")
-      else (APPLE)
-         set(_ld_library_path "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/:${LIB_INSTALL_DIR}:${KDE4_LIB_DIR}:${QT_LIBRARY_DIR}")
-      endif (APPLE)
-      get_target_property(_executable ${_target_NAME} LOCATION )
-
-      # use add_custom_target() to have the sh-wrapper generated during build time instead of cmake time
-      add_custom_command(TARGET ${_target_NAME} POST_BUILD
-         COMMAND ${CMAKE_COMMAND}
-         -D_filename=${_executable}.shell -D_library_path_variable=${_library_path_variable}
-         -D_ld_library_path="${_ld_library_path}" -D_executable=${_executable}
-         -P ${KDE4_MODULE_DIR}/kde4_exec_via_sh.cmake
-         )
-
-      macro_additional_clean_files(${_executable}.shell)
-
-      # under UNIX, set the property WRAPPER_SCRIPT to the name of the generated shell script
-      # so it can be queried and used later on easily
-      set_target_properties(${_target_NAME} PROPERTIES WRAPPER_SCRIPT ${_executable}.shell)
-
-   else (UNIX)
-      # under windows, set the property WRAPPER_SCRIPT just to the name of the executable
-      # maybe later this will change to a generated batch file (for setting the PATH so that the Qt libs are found)
-      get_target_property(_executable ${_target_NAME} LOCATION )
-      set_target_properties(${_target_NAME} PROPERTIES WRAPPER_SCRIPT ${_executable})
-
-      set(_ld_library_path "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}\;${LIB_INSTALL_DIR}\;${KDE4_LIB_DIR}\;${QT_LIBRARY_DIR}")
-      get_target_property(_executable ${_target_NAME} LOCATION )
-
-      # use add_custom_target() to have the batch-file-wrapper generated during build time instead of cmake time
-      add_custom_command(TARGET ${_target_NAME} POST_BUILD
-         COMMAND ${CMAKE_COMMAND}
-         -D_filename="${_executable}.bat"
-         -D_ld_library_path="${_ld_library_path}" -D_executable="${_executable}"
-         -P ${KDE4_MODULE_DIR}/kde4_exec_via_sh.cmake
-         )
-
-   endif (UNIX)
-endmacro (KDE4_HANDLE_RPATH_FOR_EXECUTABLE)
-
-
-macro (KDE4_ADD_PLUGIN _target_NAME _with_PREFIX)
-#is the first argument is "WITH_PREFIX" then keep the standard "lib" prefix, otherwise set the prefix empty
-   if (${_with_PREFIX} STREQUAL "WITH_PREFIX")
-      set(_first_SRC)
-   else (${_with_PREFIX} STREQUAL "WITH_PREFIX")
-      set(_first_SRC ${_with_PREFIX})
-   endif (${_with_PREFIX} STREQUAL "WITH_PREFIX")
-
-   set(_SRCS ${_first_SRC} ${ARGN})
-   kde4_handle_automoc(${_target_NAME} _SRCS)
-   if (KDE4_ENABLE_FINAL)
-      kde4_create_final_files(${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_final_cpp.cpp _separate_files ${_SRCS})
-      add_library(${_target_NAME} MODULE  ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_final_cpp.cpp ${_separate_files})
-   else (KDE4_ENABLE_FINAL)
-      add_library(${_target_NAME} MODULE ${_SRCS})
-   endif (KDE4_ENABLE_FINAL)
-
-   if (_first_SRC)
-      set_target_properties(${_target_NAME} PROPERTIES PREFIX "")
-   endif (_first_SRC)
-
-   kde4_handle_rpath_for_library(${_target_NAME})
-
-   if (WIN32)
-      # for shared libraries/plugins a -DMAKE_target_LIB is required
-      string(TOUPPER ${_target_NAME} _symbol)
-      string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _symbol ${_symbol})
-      set(_symbol "MAKE_${_symbol}_LIB")
-      set_target_properties(${_target_NAME} PROPERTIES DEFINE_SYMBOL ${_symbol})
-   endif (WIN32)
-
-endmacro (KDE4_ADD_PLUGIN _target_NAME _with_PREFIX)
-
-
-# this macro is intended to check whether a list of source
-# files has the "NOGUI" or "RUN_UNINSTALLED" keywords at the beginning
-# in _output_LIST the list of source files is returned with the "NOGUI"
-# and "RUN_UNINSTALLED" keywords removed
-# if "NOGUI" is in the list of files, the _nogui argument is set to
-# "NOGUI" (which evaluates to TRUE in cmake), otherwise it is set empty
-# (which evaluates to FALSE in cmake)
-# if "RUN_UNINSTALLED" is in the list of files, the _uninst argument is set to
-# "RUN_UNINSTALLED" (which evaluates to TRUE in cmake), otherwise it is set empty
-# (which evaluates to FALSE in cmake)
-# if "TEST" is in the list of files, the _test argument is set to
-# "TEST" (which evaluates to TRUE in cmake), otherwise it is set empty
-# (which evaluates to FALSE in cmake)
-macro(KDE4_CHECK_EXECUTABLE_PARAMS _output_LIST _nogui _uninst _test)
-   set(${_nogui})
-   set(${_uninst})
-   set(${_test})
-   set(${_output_LIST} ${ARGN})
-   list(LENGTH ${_output_LIST} count)
-
-   list(GET ${_output_LIST} 0 first_PARAM)
-
-   set(second_PARAM "NOTFOUND")
-   if (${count} GREATER 1)
-      list(GET ${_output_LIST} 1 second_PARAM)
-   endif (${count} GREATER 1)
-
-   set(remove "NOTFOUND")
-
-   if (${first_PARAM} STREQUAL "NOGUI")
-      set(${_nogui} "NOGUI")
-      set(remove 0)
-   endif (${first_PARAM} STREQUAL "NOGUI")
-
-   if (${first_PARAM} STREQUAL "RUN_UNINSTALLED")
-      set(${_uninst} "RUN_UNINSTALLED")
-      set(remove 0)
-   endif (${first_PARAM} STREQUAL "RUN_UNINSTALLED")
-
-   if (${first_PARAM} STREQUAL "TEST")
-      set(${_test} "TEST")
-      set(remove 0)
-   endif (${first_PARAM} STREQUAL "TEST")
-
-   if (${second_PARAM} STREQUAL "NOGUI")
-      set(${_nogui} "NOGUI")
-      set(remove 0;1)
-   endif (${second_PARAM} STREQUAL "NOGUI")
-
-   if (${second_PARAM} STREQUAL "RUN_UNINSTALLED")
-      set(${_uninst} "RUN_UNINSTALLED")
-      set(remove 0;1)
-   endif (${second_PARAM} STREQUAL "RUN_UNINSTALLED")
-
-   if (${second_PARAM} STREQUAL "TEST")
-      set(${_test} "TEST")
-      set(remove 0;1)
-   endif (${second_PARAM} STREQUAL "TEST")
-
-
-
-   if (NOT "${remove}" STREQUAL "NOTFOUND")
-      list(REMOVE_AT ${_output_LIST} ${remove})
-   endif (NOT "${remove}" STREQUAL "NOTFOUND")
-
-endmacro(KDE4_CHECK_EXECUTABLE_PARAMS)
-
-
-macro (KDE4_ADD_KDEINIT_EXECUTABLE _target_NAME )
-
-   kde4_check_executable_params(_SRCS _nogui _uninst _test ${ARGN})
-
-#   if (WIN32)
-#      # under windows, just build a normal executable
-#      KDE4_ADD_EXECUTABLE(${_target_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ${ARGN} )
-#   else (WIN32)
-      # under UNIX, create a shared library and a small executable, which links to this library
-
-   kde4_handle_automoc(kdeinit_${_target_NAME} _SRCS)
-   if (KDE4_ENABLE_FINAL)
-      kde4_create_final_files(${CMAKE_CURRENT_BINARY_DIR}/kdeinit_${_target_NAME}_final_cpp.cpp _separate_files ${_SRCS})
-      add_library(kdeinit_${_target_NAME} SHARED  ${CMAKE_CURRENT_BINARY_DIR}/kdeinit_${_target_NAME}_final_cpp.cpp ${_separate_files})
-
-   else (KDE4_ENABLE_FINAL)
-      add_library(kdeinit_${_target_NAME} SHARED ${_SRCS})
-   endif (KDE4_ENABLE_FINAL)
-
-   kde4_handle_rpath_for_library(kdeinit_${_target_NAME})
-   set_target_properties(kdeinit_${_target_NAME} PROPERTIES OUTPUT_NAME kdeinit4_${_target_NAME})
-
-   configure_file(${KDE4_MODULE_DIR}/kde4init_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp)
-   kde4_add_executable(${_target_NAME} "${_nogui}" "${_uninst}" ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp)
-   target_link_libraries(${_target_NAME} kdeinit_${_target_NAME})
-#   endif (WIN32)
-
-   if (WIN32)
-      target_link_libraries(${_target_NAME} ${QT_QTMAIN_LIBRARY})
-   endif (WIN32)
-
-endmacro (KDE4_ADD_KDEINIT_EXECUTABLE)
-
-# add a unit test, which is executed when running make test
-# it will be built with RPATH pointing to the build dir
-# The targets are always created, but only built for the "all"
-# target if the option KDE4_BUILD_TESTS is enabled. Otherwise the rules for the target
-# are created but not built by default. You can build them by manually building the target.
-# The name of the target can be specified using TESTNAME <testname>, if it is not given
-# the macro will default to the <name>
-macro (KDE4_ADD_UNIT_TEST _test_NAME)
-    set(_srcList ${ARGN})
-    set(_targetName ${_test_NAME})
-    if( ${ARGV1} STREQUAL "TESTNAME" )
-        set(_targetName ${ARGV2})
-        list(REMOVE_AT _srcList 0 1)
-    endif( ${ARGV1} STREQUAL "TESTNAME" )
-    
-    set(_nogui)
-    list(GET ${_srcList} 0 first_PARAM)
-    if( ${first_PARAM} STREQUAL "NOGUI" )
-        set(_nogui "NOGUI")
-    endif( ${first_PARAM} STREQUAL "NOGUI" )
-
-    kde4_add_executable( ${_test_NAME} TEST ${_srcList} )
-
-    if(NOT KDE4_TEST_OUTPUT)
-        set(KDE4_TEST_OUTPUT plaintext)
-    endif(NOT KDE4_TEST_OUTPUT)
-    set(KDE4_TEST_OUTPUT ${KDE4_TEST_OUTPUT} CACHE STRING "The output to generate when running the QTest unit tests")
-
-    set(using_qtest "")
-    foreach(_filename ${_srcList})
-        if(NOT using_qtest)
-            if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${_filename}")
-                file(READ ${_filename} file_CONTENT)
-                string(REGEX MATCH "QTEST_(KDE)?MAIN" using_qtest "${file_CONTENT}")
-            endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${_filename}")
-        endif(NOT using_qtest)
-    endforeach(_filename)
-
-    set(_executable ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME})
-    if (Q_WS_MAC AND NOT _nogui)
-        set(_executable ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME}.app/Contents/MacOS/${_test_NAME})
-    else (Q_WS_MAC AND NOT _nogui)
-        # Use .shell wrapper where available, to use uninstalled libs.
-        if (UNIX)
-            set(_executable ${_executable}.shell)
-        endif (UNIX)
-    endif (Q_WS_MAC AND NOT _nogui)
-    
-    if (using_qtest AND KDE4_TEST_OUTPUT STREQUAL "xml")
-        #MESSAGE(STATUS "${_targetName} : Using QTestLib, can produce XML report.")
-        add_test( ${_targetName} ${_executable} -xml -o ${_targetName}.tml)
-    else (using_qtest AND KDE4_TEST_OUTPUT STREQUAL "xml")
-        #MESSAGE(STATUS "${_targetName} : NOT using QTestLib, can't produce XML report, please use QTestLib to write your unit tests.")
-        add_test( ${_targetName} ${_executable} )
-    endif (using_qtest AND KDE4_TEST_OUTPUT STREQUAL "xml")
-
-#    add_test( ${_targetName} ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME} -xml -o ${_test_NAME}.tml )
-
-    if (NOT MSVC_IDE)   #not needed for the ide
-        # if the tests are EXCLUDE_FROM_ALL, add a target "buildtests" to build all tests
-        if (NOT KDE4_BUILD_TESTS)
-           get_directory_property(_buildtestsAdded BUILDTESTS_ADDED)
-           if(NOT _buildtestsAdded)
-              add_custom_target(buildtests)
-              set_directory_properties(PROPERTIES BUILDTESTS_ADDED TRUE)
-           endif(NOT _buildtestsAdded)
-           add_dependencies(buildtests ${_test_NAME})
-        endif (NOT KDE4_BUILD_TESTS)
-    endif (NOT MSVC_IDE)
-
-endmacro (KDE4_ADD_UNIT_TEST)
-
-macro (KDE4_ADD_TEST_EXECUTABLE _target_NAME)
-   MESSAGE(SEND_ERROR "KDE4_ADD_TEST_EXECUTABLE is deprecated use KDE4_ADD_EXECUTABLE(<target> TEST <files>) instead")
-endmacro (KDE4_ADD_TEST_EXECUTABLE)
-
-
-macro (KDE4_ADD_EXECUTABLE _target_NAME)
-
-   kde4_check_executable_params( _SRCS _nogui _uninst _test ${ARGN})
-
-   set(_add_executable_param)
-   set(_type "GUI")
-
-   # determine additional parameters for add_executable()
-   # for GUI apps, create a bundle on OSX
-   if (Q_WS_MAC)
-      set(_add_executable_param MACOSX_BUNDLE)
-   endif (Q_WS_MAC)
-
-   # for GUI apps, this disables the additional console under Windows
-   if (WIN32)
-      set(_add_executable_param WIN32)
-   endif (WIN32)
-
-   if (_nogui)
-      set(_type "NOGUI")
-      set(_add_executable_param)
-   endif (_nogui)
-
-   if (_uninst OR _test)
-      set(_type "RUN_UNINSTALLED ${_type}")
-   endif (_uninst OR _test)
-
-   if (_test AND NOT KDE4_BUILD_TESTS)
-      set(_add_executable_param ${_add_executable_param} EXCLUDE_FROM_ALL)
-   endif (_test AND NOT KDE4_BUILD_TESTS)
-
-   kde4_handle_automoc(${_target_NAME} _SRCS)
-   if (KDE4_ENABLE_FINAL)
-      kde4_create_final_files(${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_final_cpp.cpp _separate_files ${_SRCS})
-      add_executable(${_target_NAME} ${_add_executable_param} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_final_cpp.cpp ${_separate_files})
-   else (KDE4_ENABLE_FINAL)
-      add_executable(${_target_NAME} ${_add_executable_param} ${_SRCS})
-   endif (KDE4_ENABLE_FINAL)
-
-   if (_test)
-      set_target_properties(${_target_NAME} PROPERTIES COMPILE_FLAGS -DKDESRCDIR="\\"${CMAKE_CURRENT_SOURCE_DIR}\\"")
-   endif (_test)
-
-   kde4_handle_rpath_for_executable(${_target_NAME} ${_type})
-
-   if (WIN32)
-      target_link_libraries(${_target_NAME} ${QT_QTMAIN_LIBRARY})
-   endif (WIN32)
-
-endmacro (KDE4_ADD_EXECUTABLE)
-
-
-macro (KDE4_ADD_LIBRARY _target_NAME _lib_TYPE)
-#is the first argument is "WITH_PREFIX" then keep the standard "lib" prefix, otherwise set the prefix empty
-
-   set(_first_SRC ${_lib_TYPE})
-   set(_add_lib_param)
-
-   if (${_lib_TYPE} STREQUAL "STATIC")
-      set(_first_SRC)
-      set(_add_lib_param STATIC)
-   endif (${_lib_TYPE} STREQUAL "STATIC")
-   if (${_lib_TYPE} STREQUAL "SHARED")
-      set(_first_SRC)
-      set(_add_lib_param SHARED)
-   endif (${_lib_TYPE} STREQUAL "SHARED")
-   if (${_lib_TYPE} STREQUAL "MODULE")
-      set(_first_SRC)
-      set(_add_lib_param MODULE)
-   endif (${_lib_TYPE} STREQUAL "MODULE")
-
-   set(_SRCS ${_first_SRC} ${ARGN})
-   kde4_handle_automoc(${_target_NAME} _SRCS)
-   if (KDE4_ENABLE_FINAL)
-      kde4_create_final_files(${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_final_cpp.cpp _separate_files ${_SRCS})
-      add_library(${_target_NAME} ${_add_lib_param}  ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_final_cpp.cpp ${_separate_files})
-   else (KDE4_ENABLE_FINAL)
-      add_library(${_target_NAME} ${_add_lib_param} ${_SRCS})
-   endif (KDE4_ENABLE_FINAL)
-
-   kde4_handle_rpath_for_library(${_target_NAME})
-
-   # for shared libraries a -DMAKE_target_LIB is required
-   string(TOUPPER ${_target_NAME} _symbol)
-   string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _symbol ${_symbol})
-   set(_symbol "MAKE_${_symbol}_LIB")
-   set_target_properties(${_target_NAME} PROPERTIES DEFINE_SYMBOL ${_symbol})
-
-endmacro (KDE4_ADD_LIBRARY _target_NAME _lib_TYPE)
-
-
-macro (KDE4_ADD_WIDGET_FILES _sources)
-   foreach (_current_FILE ${ARGN})
-
-      get_filename_component(_input ${_current_FILE} ABSOLUTE)
-      get_filename_component(_basename ${_input} NAME_WE)
-      set(_source ${CMAKE_CURRENT_BINARY_DIR}/${_basename}widgets.cpp)
-      set(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}widgets.moc)
-
-      # create source file from the .widgets file
-      add_custom_command(OUTPUT ${_source}
-        COMMAND ${KDE4_MAKEKDEWIDGETS_EXECUTABLE}
-        ARGS -o ${_source} ${_input}
-        MAIN_DEPENDENCY ${_input} DEPENDS ${_KDE4_MAKEKDEWIDGETS_DEP})
-
-      # create moc file
-      qt4_generate_moc(${_source} ${_moc} )
-
-      list(APPEND ${_sources} ${_source} ${_moc})
-
-   endforeach (_current_FILE)
-
-endmacro (KDE4_ADD_WIDGET_FILES)
-
-
-MACRO(KDE4_REMOVE_OBSOLETE_CMAKE_FILES)
-# the files listed here will be removed by remove_obsoleted_cmake_files.cmake, Alex
-   install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/remove_files.cmake )
-   set(module_install_dir ${DATA_INSTALL_DIR}/cmake/modules )
-
-   file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/remove_files.cmake "#generated by cmake, dont edit\n\n")
-   foreach ( _current_FILE ${ARGN})
-      file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/remove_files.cmake "message(STATUS \"Removing ${module_install_dir}/${_current_FILE}\" )\n" )
-      file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/remove_files.cmake "exec_program( ${CMAKE_COMMAND} ARGS -E remove ${module_install_dir}/${_current_FILE} OUTPUT_VARIABLE _dummy)\n" )
-   endforeach ( _current_FILE)
-
-ENDMACRO(KDE4_REMOVE_OBSOLETE_CMAKE_FILES)
-
-
-MACRO(KDE4_NO_ENABLE_FINAL _project_name)
-   if(KDE4_ENABLE_FINAL)
-      set(KDE4_ENABLE_FINAL OFF)
-      remove_definitions(-DKDE_USE_FINAL)
-      message(STATUS "You used enable-final argument but \"${_project_name}\" doesn't support it. Try to fix compile it and remove KDE4_NO_ENABLE_FINAL macro. Thanks")
-
-   endif(KDE4_ENABLE_FINAL)
-ENDMACRO(KDE4_NO_ENABLE_FINAL _project_name)
-
-
-macro(KDE4_CREATE_EXPORTS_HEADER _outputFile _libName)
-   string(TOUPPER ${_libName} _libNameUpperCase)
-   string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _libNameUpperCase ${_libNameUpperCase})
-   # the next line is is required, because in CMake arguments to macros are not real
-   # variables, but handled differently. The next line create a real CMake variable,
-   # so configure_file() will replace it correctly.
-   set(_libName ${_libName})
-   # compared to write(FILE) configure_file() only really writes the file if the
-   # contents have changed. Otherwise we would have a lot of recompiles.
-   configure_file(${KDE4_MODULE_DIR}/kde4exportsheader.h.in ${_outputFile})
-endmacro(KDE4_CREATE_EXPORTS_HEADER _outputFile _libName)
-
-
-macro (KDE4_CREATE_HTML_HANDBOOK _docbook)
-   message(STATUS "KDE4_CREATE_HTML_HANDBOOK() is deprecated. Enable the option KDE4_ENABLE_HTMLHANDBOOK instead, this will give you targets htmlhandbook for creating the html help.")
-endmacro (KDE4_CREATE_HTML_HANDBOOK)
-
-
-# adds application icon to target source list
-# 'appsources' - the sources of the application
-# 'pngfiles' - specifies the list of icon files
-# example: KDE4_ADD_WIN32_APP_ICON(myapp_SRCS "pics/cr16-myapp.png;pics/cr32-myapp.png")
-
-macro (KDE4_ADD_WIN32_APP_ICON appsources)
-    message(STATUS "KDE4_ADD_WIN32_APP_ICON() is deprecated, use KDE4_ADD_APP_ICON() instead")
-    if (WIN32)
-        find_program(PNG2ICO_EXECUTABLE NAMES png2ico)
-        find_program(WINDRES_EXECUTABLE NAMES windres)
-        if(MSVC)
-            set(WINDRES_EXECUTABLE TRUE)
-        endif(MSVC)
-        STRING(REPLACE _SRCS "" appname ${appsources})
-        if (PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE)
-            set (_outfilename ${CMAKE_CURRENT_BINARY_DIR}/${appname})
-
-            # png2ico is found by the above find_program
-#            message("png2ico ${_outfilename}.ico ${ARGN}")
-            exec_program(png2ico ARGS ${_outfilename}.ico ${ARGN})
-
-            # now make rc file for adding it to the sources
-            file(WRITE ${_outfilename}.rc "IDI_ICON1        ICON        DISCARDABLE    \"${_outfilename}.ico\"\n")
-            if (MINGW)
-                exec_program(windres
-                    ARGS "-i ${_outfilename}.rc -o ${_outfilename}_res.o --include-dir=${CMAKE_CURRENT_SOURCE_DIR}")
-                list(APPEND ${appsources} ${CMAKE_CURRENT_BINARY_DIR}/${appname}_res.o)
-            else(MINGW)
-                list(APPEND ${appsources} ${CMAKE_CURRENT_BINARY_DIR}/${appname}.rc)
-            endif(MINGW)
-        endif(PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE)
-    endif(WIN32)
-endmacro (KDE4_ADD_WIN32_APP_ICON)
-
-# adds application icon to target source list 
-
-# this macro adds an application icon to the specified target
-# mac osx notes : the application icon is added to a Mac OS X bundle so that Finder and friends show the right thing.
-# win32 notes: the application icon(s) are compiled into the application 
-# parameters: 
-# 'appsources'  - specifies the list of source files 
-# 'pattern'     - regular expression for searching application icons 
-# example: KDE4_ADD_APP_ICON( myapp_sources "pics/cr*-myapp.png")
-# example: KDE4_ADD_APP_ICON( myapp_sources "icons/oxygen/*/apps/myapp.png")
-
-macro (KDE4_ADD_APP_ICON appsources pattern)
-    string(REPLACE _SRCS "" target ${appsources})
-    if (WIN32)
-        find_program(PNG2ICO_EXECUTABLE NAMES png2ico)
-        find_program(WINDRES_EXECUTABLE NAMES windres)
-        if(MSVC)
-            set(WINDRES_EXECUTABLE TRUE)
-        endif(MSVC)
-        if (PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE)
-            string(REPLACE "*" "(.*)" pattern_rx "${pattern}")
-            file(GLOB_RECURSE files  "${pattern}")
-            foreach (it ${files})
-                string(REGEX REPLACE "${pattern_rx}" "\\1" fn "${it}")
-                if (fn MATCHES ".*16.*" )
-                    list (APPEND _icons ${it})
-                endif (fn MATCHES ".*16.*")
-                if (fn MATCHES ".*32.*" )
-                    list (APPEND _icons ${it})
-                endif (fn MATCHES ".*32.*")
-                if (fn MATCHES ".*48.*" )
-                    list (APPEND _icons ${it})
-                endif (fn MATCHES ".*48.*")
-                if (fn MATCHES ".*64.*" )
-                    list (APPEND _icons ${it})
-                endif (fn MATCHES ".*64.*")
-                if (fn MATCHES ".*128.*" )
-                    list (APPEND _icons ${it})
-                endif (fn MATCHES ".*128.*")
-            endforeach (it)
-            if (_icons)
-                set (_outfilename ${CMAKE_CURRENT_BINARY_DIR}/${target})
-                add_custom_command(OUTPUT ${_outfilename}.ico ${_outfilename}.rc
-                                   COMMAND ${PNG2ICO_EXECUTABLE} ARGS --rcfile ${_outfilename}.rc ${_outfilename}.ico ${_icons}
-                                   DEPENDS ${PNG2ICO_EXECUTABLE} ${_icons}
-                                   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                                  )
-                if (MINGW)
-                    add_custom_command(OUTPUT ${_outfilename}_res.o
-                                       COMMAND ${WINDRES_EXECUTABLE} ARGS -i ${_outfilename}.rc -o ${_outfilename}_res.o --include-dir=${CMAKE_CURRENT_SOURCE_DIR}
-                                       DEPENDS ${WINDRES_EXECUTABLE} ${_outfilename}.rc
-                                       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                                      )
-                    list(APPEND ${appsources} ${_outfilename}_res.o)
-                else(MINGW)
-                    list(APPEND ${appsources} ${_outfilename}.rc)
-                endif(MINGW)
-            else(_icons)
-                message(STATUS "Unable to find a related icon for target ${target} - application will not have an application icon!")
-            endif(_icons)
-        else(PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE)
-            message(STATUS "Unable to find the png2ico or windres utilities - application will not have an application icon!")
-        endif(PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE)
-    endif(WIN32)
-    if (Q_WS_MAC)
-        # first convert image to a tiff using the Mac OS X "sips" utility,
-        # then use tiff2icns to convert to an icon
-        find_program(SIPS_EXECUTABLE NAMES sips)
-        find_program(TIFF2ICNS_EXECUTABLE NAMES tiff2icns)
-        if (SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE)
-            file(GLOB_RECURSE files  "${pattern}")
-            # we can only test for the 128-icon like that - we don't use patterns anymore
-            foreach (it ${files})
-                if (it MATCHES ".*128.*" )
-                    set (_icon ${it})
-                endif (it MATCHES ".*128.*")
-            endforeach (it)
-            set (_outfilename ${CMAKE_CURRENT_BINARY_DIR}/${target})
-
-            if (_icon)
-                
-                # first, get the basename of our app icon
-                add_custom_command(OUTPUT ${_outfilename}.icns
-                                   COMMAND ${SIPS_EXECUTABLE} -s format tiff ${_icon} --out ${outfilename}.tiff
-                                   COMMAND ${TIFF2ICNS_EXECUTABLE} ${outfilename}.tiff ${_outfilename}.icns
-                                   DEPENDS ${_icon}
-                                   )
-
-                macro_additional_clean_files(${outfilename}.tiff ${_outfilename}.icns)
-
-                # This will register the icon into the bundle
-                set(MACOSX_BUNDLE_ICON_FILE ${target}.icns)
-
-                # Append the icns file to the sources list so it will be a dependency to the
-                # main target
-                list(APPEND ${appsources} ${_outfilename}.icns)
-
-                #            this doesn't seem to work for me - Use manual "install" instead
-                #            SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/${target}.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-
-                install(FILES ${_outfilename}.icns DESTINATION ${BIN_INSTALL_DIR}/${target}.app/Contents/Resources/)
-
-            else(_icon)
-                # TODO - try to scale a non-128 icon...? Try to convert an SVG on the fly?
-                message(STATUS "Unable to find an 128x128 icon for target ${target} - application will not have an application icon!")
-            endif(_icon)
-
-        else(SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE)
-            message(STATUS "Unable to find the sips and tiff2icns utilities - application will not have an application icon!")
-        endif(SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE)
-    endif(Q_WS_MAC)    
-endmacro (KDE4_ADD_APP_ICON)
-
-
--- cmake/modules/InstallSettings.cmake	
+++ cmake/modules/InstallSettings.cmake	
@@ -0,0 +1,136 @@
+# Copyright (c) 2008 Kevin Krammer <kevin.krammer@gmx.at>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
+
+if (WIN32)
+# use relative install prefix to avoid hardcoded install paths in cmake_install.cmake files
+
+   set(LIB_INSTALL_DIR      "lib${LIB_SUFFIX}" )            # The subdirectory relative to the install prefix where libraries will be installed (default is ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+
+   set(EXEC_INSTALL_PREFIX  "" )        # Base directory for executables and libraries
+   set(SHARE_INSTALL_PREFIX "share" )   # Base directory for files which go to share/
+   set(BIN_INSTALL_DIR      "bin"   )   # The install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)
+   set(SBIN_INSTALL_DIR     "sbin"  )   # The install dir for system executables (default ${EXEC_INSTALL_PREFIX}/sbin)
+
+   set(LIBEXEC_INSTALL_DIR  "${BIN_INSTALL_DIR}"          ) # The subdirectory relative to the install prefix where libraries will be installed (default is ${BIN_INSTALL_DIR})
+   set(INCLUDE_INSTALL_DIR  "include"                     ) # The subdirectory to the header prefix
+
+   set(PLUGIN_INSTALL_DIR       "lib${LIB_SUFFIX}/kde4"   ) #                "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde4)
+   set(CONFIG_INSTALL_DIR       "share/config"            ) # The config file install dir
+   set(DATA_INSTALL_DIR         "share/apps"              ) # The parent directory where applications can install their data
+   set(HTML_INSTALL_DIR         "share/doc/HTML"          ) # The HTML install dir for documentation
+   set(ICON_INSTALL_DIR         "share/icons"             ) # The icon install dir (default ${SHARE_INSTALL_PREFIX}/share/icons/)
+   set(KCFG_INSTALL_DIR         "share/config.kcfg"       ) # The install dir for kconfig files
+   set(LOCALE_INSTALL_DIR       "share/locale"            ) # The install dir for translations
+   set(MIME_INSTALL_DIR         "share/mimelnk"           ) # The install dir for the mimetype desktop files
+   set(SERVICES_INSTALL_DIR     "share/kde4/services"     ) # The install dir for service (desktop, protocol, ...) files
+   set(SERVICETYPES_INSTALL_DIR "share/kde4/servicetypes" ) # The install dir for servicestypes desktop files
+   set(SOUND_INSTALL_DIR        "share/sounds"            ) # The install dir for sound files
+   set(TEMPLATES_INSTALL_DIR    "share/templates"         ) # The install dir for templates (Create new file...)
+   set(WALLPAPER_INSTALL_DIR    "share/wallpapers"        ) # The install dir for wallpapers
+   set(DEMO_INSTALL_DIR         "share/demos"             ) # The install dir for demos
+   set(KCONF_UPDATE_INSTALL_DIR "share/apps/kconf_update" ) # The kconf_update install dir
+   set(AUTOSTART_INSTALL_DIR    "share/autostart"         ) # The install dir for autostart files
+
+   set(XDG_APPS_INSTALL_DIR      "share/applications/kde4"   ) # The XDG apps dir
+   set(XDG_DIRECTORY_INSTALL_DIR "share/desktop-directories" ) # The XDG directory
+   set(XDG_MIME_INSTALL_DIR      "share/mime/packages"       ) # The install dir for the xdg mimetypes
+
+   set(SYSCONF_INSTALL_DIR       "etc"                       ) # The kde sysconfig install dir (default /etc)
+   set(MAN_INSTALL_DIR           "share/man"                 ) # The kde man install dir (default ${SHARE_INSTALL_PREFIX}/man/)
+   set(INFO_INSTALL_DIR          "share/info"                ) # The kde info install dir (default ${SHARE_INSTALL_PREFIX}/info)")
+   set(DBUS_INTERFACES_INSTALL_DIR "share/dbus-1/interfaces" ) # The kde dbus interfaces install dir (default  ${SHARE_INSTALL_PREFIX}/dbus-1/interfaces)")
+   set(DBUS_SERVICES_INSTALL_DIR "share/dbus-1/services"     ) # The kde dbus services install dir (default  ${SHARE_INSTALL_PREFIX}/dbus-1/services)")
+
+else (WIN32)
+
+   # this macro implements some very special logic how to deal with the cache
+   # by default the various install locations inherit their value from theit "parent" variable
+   # so if you set CMAKE_INSTALL_PREFIX, then EXEC_INSTALL_PREFIX, PLUGIN_INSTALL_DIR will
+   # calculate their value by appending subdirs to CMAKE_INSTALL_PREFIX
+   # this would work completely without using the cache.
+   # but if somebody wants e.g. a different EXEC_INSTALL_PREFIX this value has to go into
+   # the cache, otherwise it will be forgotten on the next cmake run.
+   # Once a variable is in the cache, it doesn't depend on its "parent" variables
+   # anymore and you can only change it by editing it directly.
+   # this macro helps in this regard, because as long as you don't set one of the
+   # variables explicitely to some location, it will always calculate its value from its
+   # parents. So modifying CMAKE_INSTALL_PREFIX later on will have the desired effect.
+   # But once you decide to set e.g. EXEC_INSTALL_PREFIX to some special location
+   # this will go into the cache and it will no longer depend on CMAKE_INSTALL_PREFIX.
+   macro(_SET_FANCY _var _value _comment)
+      set(predefinedvalue "${_value}")
+
+      if (NOT DEFINED ${_var})
+         set(${_var} ${predefinedvalue})
+      else (NOT DEFINED ${_var})
+         set(${_var} "${${_var}}" CACHE PATH "${_comment}")
+      endif (NOT DEFINED ${_var})
+   endmacro(_SET_FANCY)
+
+
+   _set_fancy(EXEC_INSTALL_PREFIX  "${CMAKE_INSTALL_PREFIX}"                 "Base directory for executables and libraries")
+   _set_fancy(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share"           "Base directory for files which go to share/")
+   _set_fancy(BIN_INSTALL_DIR      "${EXEC_INSTALL_PREFIX}/bin"              "The install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)")
+   _set_fancy(SBIN_INSTALL_DIR     "${EXEC_INSTALL_PREFIX}/sbin"             "The install dir for system executables (default ${EXEC_INSTALL_PREFIX}/sbin)")
+   _set_fancy(LIB_INSTALL_DIR      "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" "The subdirectory relative to the install prefix where libraries will be installed (default is ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX})")
+   _set_fancy(LIBEXEC_INSTALL_DIR  "${LIB_INSTALL_DIR}/kde4/libexec"         "The subdirectory relative to the install prefix where libraries will be installed (default is ${LIB_INSTALL_DIR}/kde4/libexec)")
+   _set_fancy(INCLUDE_INSTALL_DIR  "${CMAKE_INSTALL_PREFIX}/include"         "The subdirectory to the header prefix")
+
+   _set_fancy(PLUGIN_INSTALL_DIR       "${LIB_INSTALL_DIR}/kde4"                "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde4)")
+   _set_fancy(CONFIG_INSTALL_DIR       "${SHARE_INSTALL_PREFIX}/config"         "The config file install dir")
+   _set_fancy(DATA_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/apps"           "The parent directory where applications can install their data")
+   _set_fancy(HTML_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/doc/HTML"       "The HTML install dir for documentation")
+   _set_fancy(ICON_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/icons"          "The icon install dir (default ${SHARE_INSTALL_PREFIX}/share/icons/)")
+   _set_fancy(KCFG_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/config.kcfg"    "The install dir for kconfig files")
+   _set_fancy(LOCALE_INSTALL_DIR       "${SHARE_INSTALL_PREFIX}/locale"         "The install dir for translations")
+   _set_fancy(MIME_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/mimelnk"        "The install dir for the mimetype desktop files")
+   _set_fancy(SERVICES_INSTALL_DIR     "${SHARE_INSTALL_PREFIX}/kde4/services"  "The install dir for service (desktop, protocol, ...) files")
+   _set_fancy(SERVICETYPES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/kde4/servicetypes" "The install dir for servicestypes desktop files")
+   _set_fancy(SOUND_INSTALL_DIR        "${SHARE_INSTALL_PREFIX}/sounds"         "The install dir for sound files")
+   _set_fancy(TEMPLATES_INSTALL_DIR    "${SHARE_INSTALL_PREFIX}/templates"      "The install dir for templates (Create new file...)")
+   _set_fancy(WALLPAPER_INSTALL_DIR    "${SHARE_INSTALL_PREFIX}/wallpapers"     "The install dir for wallpapers")
+   _set_fancy(DEMO_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/demos"          "The install dir for demos")
+   _set_fancy(KCONF_UPDATE_INSTALL_DIR "${DATA_INSTALL_DIR}/kconf_update"       "The kconf_update install dir")
+   _set_fancy(AUTOSTART_INSTALL_DIR    "${SHARE_INSTALL_PREFIX}/autostart"      "The install dir for autostart files")
+
+   _set_fancy(XDG_APPS_INSTALL_DIR     "${SHARE_INSTALL_PREFIX}/applications/kde4"         "The XDG apps dir")
+   _set_fancy(XDG_DIRECTORY_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/desktop-directories"      "The XDG directory")
+   _set_fancy(XDG_MIME_INSTALL_DIR     "${SHARE_INSTALL_PREFIX}/mime/packages"  "The install dir for the xdg mimetypes")
+
+   _set_fancy(SYSCONF_INSTALL_DIR      "${CMAKE_INSTALL_PREFIX}/etc"            "The kde sysconfig install dir (default ${CMAKE_INSTALL_PREFIX}/etc)")
+   _set_fancy(MAN_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/man"            "The kde man install dir (default ${SHARE_INSTALL_PREFIX}/man/)")
+   _set_fancy(INFO_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/info"           "The kde info install dir (default ${SHARE_INSTALL_PREFIX}/info)")
+   _set_fancy(DBUS_INTERFACES_INSTALL_DIR      "${SHARE_INSTALL_PREFIX}/dbus-1/interfaces" "The kde dbus interfaces install dir (default  ${SHARE_INSTALL_PREFIX}/dbus-1/interfaces)")
+   _set_fancy(DBUS_SERVICES_INSTALL_DIR      "${SHARE_INSTALL_PREFIX}/dbus-1/services"     "The kde dbus services install dir (default  ${SHARE_INSTALL_PREFIX}/dbus-1/services)")
+
+endif (WIN32)
+
+# The INSTALL_TARGETS_DEFAULT_ARGS variable should be used when libraries are installed.
+# The arguments are also ok for regular executables, i.e. executables which don't go
+# into sbin/ or libexec/, but for installing executables the basic syntax 
+# INSTALL(TARGETS kate DESTINATION "${BIN_INSTALL_DIR}")
+# is enough, so using this variable there doesn't help a lot.
+# The variable must not be used for installing plugins.
+# Usage is like this:
+#    install(TARGETS kdecore kdeui ${INSTALL_TARGETS_DEFAULT_ARGS} )
+#
+# This will install libraries correctly under UNIX, OSX and Windows (i.e. dll's go
+# into bin/.
+# Later on it will be possible to extend this for installing OSX frameworks
+# The COMPONENT Devel argument has the effect that static libraries belong to the 
+# "Devel" install component. If we use this also for all install() commands
+# for header files, it will be possible to install
+#   -everything: make install OR cmake -P cmake_install.cmake
+#   -only the development files: cmake -DCOMPONENT=Devel -P cmake_install.cmake
+#   -everything except the development files: cmake -DCOMPONENT=Unspecified -P cmake_install.cmake
+# This can then also be used for packaging with cpack.
+
+set(INSTALL_TARGETS_DEFAULT_ARGS  RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
+                                  LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
+                                  ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT Devel )
+
+
--- cmake/modules/FindQt4.cmake	
+++ cmake/modules/FindQt4.cmake	
@@ -770,55 +770,55 @@ IF (QT4_QMAKE_FOUND)
   ELSE (QT_USE_FRAMEWORKS)
     
     # Set QT_QTCORE_LIBRARY by searching for a lib with "QtCore."  as part of the filename
-    FIND_LIBRARY(QT_QTCORE_LIBRARY NAMES QtCore QtCore4 QtCored4          PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH )
+    FIND_LIBRARY(QT_QTCORE_LIBRARY NAMES QtCore QtCore4 QtCored4 QtCore_debug         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH )
 
     # Set QT_QT3SUPPORT_LIBRARY
-    FIND_LIBRARY(QT_QT3SUPPORT_LIBRARY NAMES Qt3Support Qt3Support4 Qt3Supportd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+    FIND_LIBRARY(QT_QT3SUPPORT_LIBRARY NAMES Qt3Support Qt3Support_debug Qt3Support4 Qt3Supportd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
     # Set QT_QTGUI_LIBRARY
-    FIND_LIBRARY(QT_QTGUI_LIBRARY NAMES QtGui QtGui4 QtGuid4            PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+    FIND_LIBRARY(QT_QTGUI_LIBRARY NAMES QtGui QtGui_debug QtGui_debug QtGui4 QtGuid4            PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
     # Set QT_QTMOTIF_LIBRARY
     IF(Q_WS_X11)
-      FIND_LIBRARY(QT_QTMOTIF_LIBRARY NAMES QtMotif          PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+      FIND_LIBRARY(QT_QTMOTIF_LIBRARY NAMES QtMotif  QtMotif_debug PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
     ENDIF(Q_WS_X11)
 
     # Set QT_QTNETWORK_LIBRARY
-    FIND_LIBRARY(QT_QTNETWORK_LIBRARY NAMES QtNetwork QtNetwork4 QtNetworkd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+    FIND_LIBRARY(QT_QTNETWORK_LIBRARY NAMES QtNetwork QtNetwork_debug QtNetwork4 QtNetworkd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
     # Set QT_QTNSPLUGIN_LIBRARY
-    FIND_LIBRARY(QT_QTNSPLUGIN_LIBRARY NAMES QtNsPlugin      PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+    FIND_LIBRARY(QT_QTNSPLUGIN_LIBRARY NAMES QtNsPlugin QtNsPlugin_debug PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
     # Set QT_QTOPENGL_LIBRARY
-    FIND_LIBRARY(QT_QTOPENGL_LIBRARY NAMES QtOpenGL QtOpenGL4 QtOpenGLd4    PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+    FIND_LIBRARY(QT_QTOPENGL_LIBRARY NAMES QtOpenGL QtOpenGL_debug QtOpenGL4 QtOpenGLd4    PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
     # Set QT_QTSQL_LIBRARY
-    FIND_LIBRARY(QT_QTSQL_LIBRARY NAMES QtSql QtSql4 QtSqld4       PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+    FIND_LIBRARY(QT_QTSQL_LIBRARY NAMES QtSql QtSql_debug QtSql4 QtSqld4       PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
     # Set QT_QTXML_LIBRARY
-    FIND_LIBRARY(QT_QTXML_LIBRARY NAMES QtXml QtXml4 QtXmld4       PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+    FIND_LIBRARY(QT_QTXML_LIBRARY NAMES QtXml QtXml_debug QtXml4 QtXmld4       PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
     # Set QT_QTSVG_LIBRARY
-    FIND_LIBRARY(QT_QTSVG_LIBRARY NAMES QtSvg QtSvg4 QtSvgd4       PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+    FIND_LIBRARY(QT_QTSVG_LIBRARY NAMES QtSvg QtSvg_debug QtSvg4 QtSvgd4       PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
     # Set QT_QTSCRIPT_LIBRARY
-    FIND_LIBRARY(QT_QTSCRIPT_LIBRARY NAMES QtScript QtScript4 QtScriptd4   PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+    FIND_LIBRARY(QT_QTSCRIPT_LIBRARY NAMES QtScript QtScript_debug QtScript4 QtScriptd4   PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
     # Set QT_QTUITOOLS_LIBRARY
-    FIND_LIBRARY(QT_QTUITOOLS_LIBRARY NAMES QtUiTools QtUiTools4 QtUiToolsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+    FIND_LIBRARY(QT_QTUITOOLS_LIBRARY NAMES QtUiTools QtUiTools_debug QtUiTools4 QtUiToolsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
     # Set QT_QTTEST_LIBRARY
-    FIND_LIBRARY(QT_QTTEST_LIBRARY NAMES QtTest QtTest4 QtTestd4          PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+    FIND_LIBRARY(QT_QTTEST_LIBRARY NAMES QtTest QtTest_debug QtTest4 QtTestd4          PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
-    FIND_LIBRARY(QT_QTDBUS_LIBRARY NAMES QtDBus QtDBus4 QtDBusd4         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+    FIND_LIBRARY(QT_QTDBUS_LIBRARY NAMES QtDBus QtDBus_debug QtDBus4 QtDBusd4         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
-    FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY NAMES QtAssistantClient QtAssistantClient4 QtAssistantClientd4         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+    FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY NAMES QtAssistantClient QtAssistantClient_debug QtAssistantClient4 QtAssistantClientd4         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
-    FIND_LIBRARY(QT_QTHELP_LIBRARY NAMES QtHelp QtHelp4 QtHelpd4         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+    FIND_LIBRARY(QT_QTHELP_LIBRARY NAMES QtHelp QtHelp_debug QtHelp4 QtHelpd4         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
-    FIND_LIBRARY(QT_QTWEBKIT_LIBRARY NAMES QtWebKit QtWebKit4 QtWebKitd4         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+    FIND_LIBRARY(QT_QTWEBKIT_LIBRARY NAMES QtWebKit QtWebKit_debug QtWebKit4 QtWebKitd4         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
-    FIND_LIBRARY(QT_QTXMLPATTERNS_LIBRARY NAMES QtXmlPatterns QtXmlPatterns4 QtXmlPatternsd4         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+    FIND_LIBRARY(QT_QTXMLPATTERNS_LIBRARY NAMES QtXmlPatterns QtXmlPatterns_debug QtXmlPatterns4 QtXmlPatternsd4         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
 
     IF(MSVC)
@@ -867,10 +867,10 @@ IF (QT4_QMAKE_FOUND)
   FIND_LIBRARY(QT_QTASSISTANT_LIBRARY NAMES QtAssistantClient QtAssistantClient4 QtAssistant QtAssistant4 QtAssistantd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
   # Set QT_QTDESIGNER_LIBRARY
-  FIND_LIBRARY(QT_QTDESIGNER_LIBRARY NAMES QtDesigner QtDesigner4 QtDesignerd4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTDESIGNER_LIBRARY NAMES QtDesigner QtDesigner_debug QtDesigner4 QtDesignerd4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
 
   # Set QT_QTDESIGNERCOMPONENTS_LIBRARY
-  FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY NAMES QtDesignerComponents QtDesignerComponents4 QtDesignerComponentsd4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY NAMES QtDesignerComponents QtDesignerComponents_debug QtDesignerComponents4 QtDesignerComponentsd4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
 
   # Set QT_QTMAIN_LIBRARY
   IF(WIN32)
--- cmake/modules/COPYING-CMAKE-SCRIPTS	
+++ cmake/modules/COPYING-CMAKE-SCRIPTS	
@@ -0,0 +1,22 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products 
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Property changes on: cmake/modules/COPYING-CMAKE-SCRIPTS
___________________________________________________________________
Added: svn:mergeinfo

--- cmake/modules/FindAutomoc4.cmake	
+++ cmake/modules/FindAutomoc4.cmake	
@@ -0,0 +1,52 @@
+# - Try to find automoc4
+# Once done this will define
+#
+#  AUTOMOC4_FOUND - automoc4 has been found
+#  AUTOMOC4_EXECUTABLE - the automoc4 tool
+#
+# It also adds the following macros
+#  AUTOMOC4(<target> <SRCS_VAR>)
+#    Use this to run automoc4 on all files contained in the list <SRCS_VAR>.
+#
+#  AUTOMOC4_MOC_HEADERS(<target> header1.h header2.h)
+#    Use this to add more header files to be processed with automoc4.
+
+
+# Copyright (c) 2008, Alexander Neundorf, <neundorf@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+# check if we are inside KDESupport and automoc is enabled
+if("${KDESupport_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
+   # when building this project as part of kdesupport
+   set(AUTOMOC4_CONFIG_FILE "${KDESupport_SOURCE_DIR}/automoc/Automoc4Config.cmake")
+else("${KDESupport_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
+   # when building this project outside kdesupport
+   find_file(AUTOMOC4_CONFIG_FILE NAMES Automoc4Config.cmake 
+             PATH_SUFFIXES automoc4
+             PATHS ${CMAKE_SYSTEM_LIBRARY_PATH} ${CMAKE_INSTALL_PREFIX}/lib 
+             NO_DEFAULT_PATH )
+endif("${KDESupport_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
+
+
+if(AUTOMOC4_CONFIG_FILE)
+   include(${AUTOMOC4_CONFIG_FILE})
+   set(AUTOMOC4_FOUND TRUE)
+else(AUTOMOC4_CONFIG_FILE)
+   set(AUTOMOC4_FOUND FALSE)
+endif(AUTOMOC4_CONFIG_FILE)
+
+if (AUTOMOC4_FOUND)
+   if (NOT Automoc4_FIND_QUIETLY)
+      message(STATUS "Found Automoc4: ${AUTOMOC4_EXECUTABLE}")
+   endif (NOT Automoc4_FIND_QUIETLY)
+else (AUTOMOC4_FOUND)
+   if (Automoc4_FIND_REQUIRED)
+      message(FATAL_ERROR "Did not find automoc4 (part of kdesupport).")
+   else (Automoc4_FIND_REQUIRED)
+      if (NOT Automoc4_FIND_QUIETLY)
+         message(STATUS "Did not find automoc4 (part of kdesupport).")
+      endif (NOT Automoc4_FIND_QUIETLY)
+   endif (Automoc4_FIND_REQUIRED)
+endif (AUTOMOC4_FOUND)

Property changes on: cmake/modules/FindAutomoc4.cmake
___________________________________________________________________
Added: svn:eol-style
   + native

--- cmake/CMakeLists.txt	
+++ cmake/CMakeLists.txt	
@@ -1,4 +1,3 @@
 
-add_subdirectory(automoc)
 #add_subdirectory(modules)
 
--- interfaces/org.kde.Akonadi.Resource.xml	
+++ interfaces/org.kde.Akonadi.Resource.xml	
@@ -1,30 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="org.kde.Akonadi.Resource">
-    <signal name="nameChanged">
-      <arg name="name" type="s" direction="out"/>
-    </signal>
-    <method name="requestItemDelivery">
-      <arg type="b" direction="out"/>
-      <arg name="uid" type="x" direction="in"/>
-      <arg name="remoteId" type="s" direction="in"/>
-      <arg name="parts" type="as" direction="in"/>
-    </method>
-    <method name="synchronize">
-      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
-    </method>
-    <method name="synchronizeCollectionTree">
-      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
-    </method>
-    <method name="synchronizeCollection">
-      <arg name="collectionId" type="x" direction="in"/>
-      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
-    </method>
-    <method name="setName">
-      <arg name="name" type="s" direction="in"/>
-    </method>
-    <method name="name">
-      <arg type="s" direction="out"/>
-    </method>
-  </interface>
-</node>
--- interfaces/org.kde.Akonadi.AgentManager.xml	
+++ interfaces/org.kde.Akonadi.AgentManager.xml	
@@ -1,123 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="org.kde.Akonadi.AgentManager">
-    <signal name="agentTypeAdded">
-      <arg name="agentType" type="s" direction="out"/>
-    </signal>
-    <signal name="agentTypeRemoved">
-      <arg name="agentType" type="s" direction="out"/>
-    </signal>
-    <signal name="agentInstanceAdded">
-      <arg name="agentIdentifier" type="s" direction="out"/>
-    </signal>
-    <signal name="agentInstanceRemoved">
-      <arg name="agentIdentifier" type="s" direction="out"/>
-    </signal>
-    <signal name="agentInstanceStatusChanged">
-      <arg name="agentIdentifier" type="s" direction="out"/>
-      <arg name="status" type="i" direction="out"/>
-      <arg name="message" type="s" direction="out"/>
-    </signal>
-    <signal name="agentInstanceProgressChanged">
-      <arg name="agentIdentifier" type="s" direction="out"/>
-      <arg name="progress" type="u" direction="out"/>
-      <arg name="message" type="s" direction="out"/>
-    </signal>
-    <signal name="agentInstanceNameChanged">
-      <arg name="agentIdentifier" type="s" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-    </signal>
-    <signal name="agentInstanceWarning">
-      <arg name="agentIdentifier" type="s" direction="out"/>
-      <arg name="message" type="s" direction="out"/>
-    </signal>
-    <signal name="agentInstanceError">
-      <arg name="agentIdentifier" type="s" direction="out"/>
-      <arg name="message" type="s" direction="out"/>
-    </signal>
-
-    <method name="agentTypes">
-      <arg type="as" direction="out"/>
-    </method>
-    <method name="agentName">
-      <arg type="s" direction="out"/>
-      <arg name="identifier" type="s" direction="in"/>
-    </method>
-    <method name="agentComment">
-      <arg type="s" direction="out"/>
-      <arg name="identifier" type="s" direction="in"/>
-    </method>
-    <method name="agentIcon">
-      <arg type="s" direction="out"/>
-      <arg name="identifier" type="s" direction="in"/>
-    </method>
-    <method name="agentMimeTypes">
-      <arg type="as" direction="out"/>
-      <arg name="identifier" type="s" direction="in"/>
-    </method>
-    <method name="agentCapabilities">
-      <arg type="as" direction="out"/>
-      <arg name="identifier" type="s" direction="in"/>
-    </method>
-    <method name="createAgentInstance">
-      <arg type="s" direction="out"/>
-      <arg name="identifier" type="s" direction="in"/>
-    </method>
-    <method name="removeAgentInstance">
-      <arg name="identifier" type="s" direction="in"/>
-    </method>
-    <method name="agentInstanceType">
-      <arg type="s" direction="out"/>
-      <arg name="identifier" type="s" direction="in"/>
-    </method>
-    <method name="agentInstances">
-      <arg type="as" direction="out"/>
-    </method>
-    <method name="agentInstanceStatus">
-      <arg type="i" direction="out"/>
-      <arg name="identifier" type="s" direction="in"/>
-    </method>
-    <method name="agentInstanceStatusMessage">
-      <arg type="s" direction="out"/>
-      <arg name="identifier" type="s" direction="in"/>
-    </method>
-    <method name="agentInstanceProgress">
-      <arg type="u" direction="out"/>
-      <arg name="identifier" type="s" direction="in"/>
-    </method>
-    <method name="agentInstanceProgressMessage">
-      <arg type="s" direction="out"/>
-      <arg name="identifier" type="s" direction="in"/>
-    </method>
-    <method name="setAgentInstanceName">
-      <arg name="identifier" type="s" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-    </method>
-    <method name="agentInstanceName">
-      <arg type="s" direction="out"/>
-      <arg name="identifier" type="s" direction="in"/>
-    </method>
-    <method name="agentInstanceConfigure">
-      <arg name="identifier" type="s" direction="in"/>
-      <arg name="windowId" type="x" direction="in"/>
-    </method>
-    <method name="agentInstanceSynchronize">
-      <arg name="identifier" type="s" direction="in"/>
-    </method>
-    <method name="agentInstanceSynchronizeCollectionTree">
-      <arg name="identifier" type="s" direction="in"/>
-    </method>
-    <method name="agentInstanceSynchronizeCollection">
-      <arg name="identifier" type="s" direction="in"/>
-      <arg name="collection" type="x" direction="in"/>
-    </method>
-    <method name="agentInstanceOnline">
-      <arg type="b" direction="out"/>
-      <arg name="identifier" type="s" direction="in"/>
-    </method>
-    <method name="setAgentInstanceOnline">
-      <arg name="identifier" type="s" direction="in"/>
-      <arg name="state" type="b" direction="in"/>
-    </method>
-  </interface>
-</node>
--- interfaces/org.kde.Akonadi.Agent.Control.xml	
+++ interfaces/org.kde.Akonadi.Agent.Control.xml	
@@ -1,13 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="org.kde.Akonadi.Agent.Control">
-    <method name="quit">
-    </method>
-    <method name="cleanup">
-    </method>
-    <method name="configure">
-      <arg name="windowId" type="x" direction="in"/>
-      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
-    </method>
-  </interface>
-</node>
--- interfaces/org.kde.Akonadi.Agent.Status.xml	
+++ interfaces/org.kde.Akonadi.Agent.Status.xml	
@@ -1,33 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="org.kde.Akonadi.Agent.Status">
-    <signal name="status">
-      <arg name="status" type="i" direction="out"/>
-      <arg name="message" type="s" direction="out"/>
-    </signal>
-    <signal name="percent">
-      <arg name="percent" type="i" direction="out"/>
-    </signal>
-    <signal name="warning">
-      <arg name="message" type="s" direction="out"/>
-    </signal>
-    <signal name="error">
-      <arg name="message" type="s" direction="out"/>
-    </signal>
-    <method name="status">
-      <arg type="i" direction="out"/>
-    </method>
-    <method name="statusMessage">
-      <arg type="s" direction="out"/>
-    </method>
-    <method name="progress">
-      <arg type="i" direction="out"/>
-    </method>
-    <method name="isOnline">
-      <arg type="b" direction="out"/>
-    </method>
-    <method name="setOnline">
-      <arg name="state" type="b" direction="in"/>
-    </method>
-  </interface>
-</node>
--- interfaces/org.kde.Akonadi.Tracer.xml	
+++ interfaces/org.kde.Akonadi.Tracer.xml	
@@ -1,33 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="org.kde.Akonadi.Tracer">
-    <method name="beginConnection">
-      <arg name="identifier" type="s" direction="in"/>
-      <arg name="msg" type="s" direction="in"/>
-    </method>
-    <method name="endConnection">
-      <arg name="identifier" type="s" direction="in"/>
-      <arg name="msg" type="s" direction="in"/>
-    </method>
-    <method name="connectionInput">
-      <arg name="identifier" type="s" direction="in"/>
-      <arg name="msg" type="s" direction="in"/>
-    </method>
-    <method name="connectionOutput">
-      <arg name="identifier" type="s" direction="in"/>
-      <arg name="msg" type="s" direction="in"/>
-    </method>
-    <method name="signal">
-      <arg name="signalName" type="s" direction="in"/>
-      <arg name="msg" type="s" direction="in"/>
-    </method>
-    <method name="warning">
-      <arg name="componentName" type="s" direction="in"/>
-      <arg name="msg" type="s" direction="in"/>
-    </method>
-    <method name="error">
-      <arg name="componentName" type="s" direction="in"/>
-      <arg name="msg" type="s" direction="in"/>
-    </method>
-  </interface>
-</node>
--- interfaces/org.kde.Akonadi.NotificationManager.xml	
+++ interfaces/org.kde.Akonadi.NotificationManager.xml	
@@ -1,11 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="org.kde.Akonadi.NotificationManager">
-    <signal name="notify">
-      <arg name="message" type="a(ayiixsayxxsas)" direction="out"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="const Akonadi::NotificationMessage::List &amp;"/>
-      
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="const Akonadi::NotificationMessage::List &amp;"/>
-    </signal>
-  </interface>
-</node>
--- interfaces/org.freedesktop.Akonadi.Agent.Control.xml	
+++ interfaces/org.freedesktop.Akonadi.Agent.Control.xml	
@@ -0,0 +1,13 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.freedesktop.Akonadi.Agent.Control">
+    <method name="quit">
+    </method>
+    <method name="cleanup">
+    </method>
+    <method name="configure">
+      <arg name="windowId" type="x" direction="in"/>
+      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
+    </method>
+  </interface>
+</node>
--- interfaces/org.freedesktop.Akonadi.Agent.Status.xml	
+++ interfaces/org.freedesktop.Akonadi.Agent.Status.xml	
@@ -0,0 +1,33 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.freedesktop.Akonadi.Agent.Status">
+    <signal name="status">
+      <arg name="status" type="i" direction="out"/>
+      <arg name="message" type="s" direction="out"/>
+    </signal>
+    <signal name="percent">
+      <arg name="percent" type="i" direction="out"/>
+    </signal>
+    <signal name="warning">
+      <arg name="message" type="s" direction="out"/>
+    </signal>
+    <signal name="error">
+      <arg name="message" type="s" direction="out"/>
+    </signal>
+    <method name="status">
+      <arg type="i" direction="out"/>
+    </method>
+    <method name="statusMessage">
+      <arg type="s" direction="out"/>
+    </method>
+    <method name="progress">
+      <arg type="i" direction="out"/>
+    </method>
+    <method name="isOnline">
+      <arg type="b" direction="out"/>
+    </method>
+    <method name="setOnline">
+      <arg name="state" type="b" direction="in"/>
+    </method>
+  </interface>
+</node>

Property changes on: interfaces/org.freedesktop.Akonadi.Agent.Status.xml
___________________________________________________________________
Added: svn:mergeinfo

--- interfaces/org.freedesktop.Akonadi.Tracer.xml	
+++ interfaces/org.freedesktop.Akonadi.Tracer.xml	
@@ -0,0 +1,33 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.freedesktop.Akonadi.Tracer">
+    <method name="beginConnection">
+      <arg name="identifier" type="s" direction="in"/>
+      <arg name="msg" type="s" direction="in"/>
+    </method>
+    <method name="endConnection">
+      <arg name="identifier" type="s" direction="in"/>
+      <arg name="msg" type="s" direction="in"/>
+    </method>
+    <method name="connectionInput">
+      <arg name="identifier" type="s" direction="in"/>
+      <arg name="msg" type="s" direction="in"/>
+    </method>
+    <method name="connectionOutput">
+      <arg name="identifier" type="s" direction="in"/>
+      <arg name="msg" type="s" direction="in"/>
+    </method>
+    <method name="signal">
+      <arg name="signalName" type="s" direction="in"/>
+      <arg name="msg" type="s" direction="in"/>
+    </method>
+    <method name="warning">
+      <arg name="componentName" type="s" direction="in"/>
+      <arg name="msg" type="s" direction="in"/>
+    </method>
+    <method name="error">
+      <arg name="componentName" type="s" direction="in"/>
+      <arg name="msg" type="s" direction="in"/>
+    </method>
+  </interface>
+</node>

Property changes on: interfaces/org.freedesktop.Akonadi.Tracer.xml
___________________________________________________________________
Added: svn:mergeinfo

--- interfaces/org.freedesktop.Akonadi.NotificationManager.xml	
+++ interfaces/org.freedesktop.Akonadi.NotificationManager.xml	
@@ -0,0 +1,11 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.freedesktop.Akonadi.NotificationManager">
+    <signal name="notify">
+      <arg name="message" type="a(ayiixsayxxsas)" direction="out"/>
+      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="const Akonadi::NotificationMessage::List &amp;"/>
+      
+      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="const Akonadi::NotificationMessage::List &amp;"/>
+    </signal>
+  </interface>
+</node>

Property changes on: interfaces/org.freedesktop.Akonadi.NotificationManager.xml
___________________________________________________________________
Added: svn:mergeinfo

--- interfaces/org.freedesktop.Akonadi.Resource.xml	
+++ interfaces/org.freedesktop.Akonadi.Resource.xml	
@@ -0,0 +1,31 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.freedesktop.Akonadi.Resource">
+    <signal name="nameChanged">
+      <arg name="name" type="s" direction="out"/>
+    </signal>
+    <method name="requestItemDelivery">
+      <arg type="b" direction="out"/>
+      <arg name="uid" type="x" direction="in"/>
+      <arg name="remoteId" type="s" direction="in"/>
+      <arg name="mimeType" type="s" direction="in"/>
+      <arg name="parts" type="as" direction="in"/>
+    </method>
+    <method name="synchronize">
+      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
+    </method>
+    <method name="synchronizeCollectionTree">
+      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
+    </method>
+    <method name="synchronizeCollection">
+      <arg name="collectionId" type="x" direction="in"/>
+      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
+    </method>
+    <method name="setName">
+      <arg name="name" type="s" direction="in"/>
+    </method>
+    <method name="name">
+      <arg type="s" direction="out"/>
+    </method>
+  </interface>
+</node>

Property changes on: interfaces/org.freedesktop.Akonadi.Resource.xml
___________________________________________________________________
Added: svn:mergeinfo

--- interfaces/CMakeLists.txt	
+++ interfaces/CMakeLists.txt	
@@ -1,10 +1,10 @@
 SET(DBUS_INTERFACE_XMLS
-  org.kde.Akonadi.AgentManager.xml
-  org.kde.Akonadi.NotificationManager.xml
-  org.kde.Akonadi.Tracer.xml
-  org.kde.Akonadi.Agent.Control.xml
-  org.kde.Akonadi.Agent.Status.xml
-  org.kde.Akonadi.Resource.xml
+  org.freedesktop.Akonadi.AgentManager.xml
+  org.freedesktop.Akonadi.NotificationManager.xml
+  org.freedesktop.Akonadi.Tracer.xml
+  org.freedesktop.Akonadi.Agent.Control.xml
+  org.freedesktop.Akonadi.Agent.Status.xml
+  org.freedesktop.Akonadi.Resource.xml
   )
 
 install( FILES ${DBUS_INTERFACE_XMLS}
--- interfaces/org.freedesktop.Akonadi.AgentManager.xml	
+++ interfaces/org.freedesktop.Akonadi.AgentManager.xml	
@@ -0,0 +1,123 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.freedesktop.Akonadi.AgentManager">
+    <signal name="agentTypeAdded">
+      <arg name="agentType" type="s" direction="out"/>
+    </signal>
+    <signal name="agentTypeRemoved">
+      <arg name="agentType" type="s" direction="out"/>
+    </signal>
+    <signal name="agentInstanceAdded">
+      <arg name="agentIdentifier" type="s" direction="out"/>
+    </signal>
+    <signal name="agentInstanceRemoved">
+      <arg name="agentIdentifier" type="s" direction="out"/>
+    </signal>
+    <signal name="agentInstanceStatusChanged">
+      <arg name="agentIdentifier" type="s" direction="out"/>
+      <arg name="status" type="i" direction="out"/>
+      <arg name="message" type="s" direction="out"/>
+    </signal>
+    <signal name="agentInstanceProgressChanged">
+      <arg name="agentIdentifier" type="s" direction="out"/>
+      <arg name="progress" type="u" direction="out"/>
+      <arg name="message" type="s" direction="out"/>
+    </signal>
+    <signal name="agentInstanceNameChanged">
+      <arg name="agentIdentifier" type="s" direction="out"/>
+      <arg name="name" type="s" direction="out"/>
+    </signal>
+    <signal name="agentInstanceWarning">
+      <arg name="agentIdentifier" type="s" direction="out"/>
+      <arg name="message" type="s" direction="out"/>
+    </signal>
+    <signal name="agentInstanceError">
+      <arg name="agentIdentifier" type="s" direction="out"/>
+      <arg name="message" type="s" direction="out"/>
+    </signal>
+
+    <method name="agentTypes">
+      <arg type="as" direction="out"/>
+    </method>
+    <method name="agentName">
+      <arg type="s" direction="out"/>
+      <arg name="identifier" type="s" direction="in"/>
+    </method>
+    <method name="agentComment">
+      <arg type="s" direction="out"/>
+      <arg name="identifier" type="s" direction="in"/>
+    </method>
+    <method name="agentIcon">
+      <arg type="s" direction="out"/>
+      <arg name="identifier" type="s" direction="in"/>
+    </method>
+    <method name="agentMimeTypes">
+      <arg type="as" direction="out"/>
+      <arg name="identifier" type="s" direction="in"/>
+    </method>
+    <method name="agentCapabilities">
+      <arg type="as" direction="out"/>
+      <arg name="identifier" type="s" direction="in"/>
+    </method>
+    <method name="createAgentInstance">
+      <arg type="s" direction="out"/>
+      <arg name="identifier" type="s" direction="in"/>
+    </method>
+    <method name="removeAgentInstance">
+      <arg name="identifier" type="s" direction="in"/>
+    </method>
+    <method name="agentInstanceType">
+      <arg type="s" direction="out"/>
+      <arg name="identifier" type="s" direction="in"/>
+    </method>
+    <method name="agentInstances">
+      <arg type="as" direction="out"/>
+    </method>
+    <method name="agentInstanceStatus">
+      <arg type="i" direction="out"/>
+      <arg name="identifier" type="s" direction="in"/>
+    </method>
+    <method name="agentInstanceStatusMessage">
+      <arg type="s" direction="out"/>
+      <arg name="identifier" type="s" direction="in"/>
+    </method>
+    <method name="agentInstanceProgress">
+      <arg type="u" direction="out"/>
+      <arg name="identifier" type="s" direction="in"/>
+    </method>
+    <method name="agentInstanceProgressMessage">
+      <arg type="s" direction="out"/>
+      <arg name="identifier" type="s" direction="in"/>
+    </method>
+    <method name="setAgentInstanceName">
+      <arg name="identifier" type="s" direction="in"/>
+      <arg name="name" type="s" direction="in"/>
+    </method>
+    <method name="agentInstanceName">
+      <arg type="s" direction="out"/>
+      <arg name="identifier" type="s" direction="in"/>
+    </method>
+    <method name="agentInstanceConfigure">
+      <arg name="identifier" type="s" direction="in"/>
+      <arg name="windowId" type="x" direction="in"/>
+    </method>
+    <method name="agentInstanceSynchronize">
+      <arg name="identifier" type="s" direction="in"/>
+    </method>
+    <method name="agentInstanceSynchronizeCollectionTree">
+      <arg name="identifier" type="s" direction="in"/>
+    </method>
+    <method name="agentInstanceSynchronizeCollection">
+      <arg name="identifier" type="s" direction="in"/>
+      <arg name="collection" type="x" direction="in"/>
+    </method>
+    <method name="agentInstanceOnline">
+      <arg type="b" direction="out"/>
+      <arg name="identifier" type="s" direction="in"/>
+    </method>
+    <method name="setAgentInstanceOnline">
+      <arg name="identifier" type="s" direction="in"/>
+      <arg name="state" type="b" direction="in"/>
+    </method>
+  </interface>
+</node>

Property changes on: interfaces/org.freedesktop.Akonadi.AgentManager.xml
___________________________________________________________________
Added: svn:mergeinfo

--- AUTHORS	
+++ AUTHORS	
@@ -9,13 +9,12 @@ Contributors:
 - Allen Winter <winter@kde.org>
 - Andreas Gungl <a.gungl@gmx.de>
 - Christian Schaarschmidt <schaarsc@gmx.de>
-- David Faure, <faure@kde.org>
+- David Faure <faure@kde.org>
 - Ingo Kloecker <kloecker@kde.org>
 - Kitware, Inc., Insight Consortium.
 - Laurent Montel <montel@kde.org>
 - Matthias Kretz <kretz@kde.org>
-- Pino Toscano, <toscano.pino@tiscali.it>
-- Robert Zwerus <arzie@dds.nl>
+- Pino Toscano <toscano.pino@tiscali.it>
 - Robert Zwerus <arzie@dds.nl>
 - Timo Hummel <timo.hummel@sap.com>
 - Will Stephenson <wstephenson@kde.org>
--- INSTALL	
+++ INSTALL	
@@ -0,0 +1,26 @@
+Akonadi's build system uses cmake.
+
+So to compile Akonadi first create a build dir
+
+  mkdir build
+  cd build
+
+then run cmake:
+
+  cmake ..
+
+(a typical cmake option that is often used is: -DCMAKE_INSTALL_PREFIX=<prefix>)
+
+cmake then presents a configuration summary. At this point you may
+want to install missing dependancies (if you do, remove the CMakeCache.txt)
+and run cmake again.
+
+Finally build Akonadi:
+
+  make
+
+And install it (in most cases root privileges are required):
+
+  make install
+
+That's all :)
--- akonadi.pc.cmake	
+++ akonadi.pc.cmake	
@@ -0,0 +1,11 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@
+libdir=@LIB_INSTALL_DIR@
+includedir=@CMAKE_INSTALL_PREFIX@/include
+
+Name: Akonadi
+Description: Akonadi server and infrastructure needed to build client libraries and applications
+Version: @AKONADI_LIB_VERSION_STRING@
+Requires: QtCore QtSql QtDBus
+Libs: -L${libdir} -lakonadiprotocolinternals
+Cflags: -I${includedir}
--- server/control/org.kde.Akonadi.Control.service.cmake	
+++ server/control/org.kde.Akonadi.Control.service.cmake	
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.kde.Akonadi.Control
-Exec=${BIN_INSTALL_DIR}/akonadi_control
--- server/control/agentmanager.h	
+++ server/control/agentmanager.h	
@@ -42,7 +42,7 @@ namespace Akonadi {
 class AgentManager : public QObject
 {
   Q_OBJECT
-  Q_CLASSINFO( "D-Bus Interface", "org.kde.Akonadi.AgentManager" )
+  Q_CLASSINFO( "D-Bus Interface", "org.freedesktop.Akonadi.AgentManager" )
 
   public:
     /**
@@ -68,7 +68,7 @@ class AgentManager : public QObject
      */
     static QString configPath( bool writeable );
 
-    org::kde::Akonadi::Tracer* tracer() const { return mTracer; }
+    org::freedesktop::Akonadi::Tracer* tracer() const { return mTracer; }
 
   public Q_SLOTS:
     /**
@@ -336,7 +336,7 @@ class AgentManager : public QObject
      */
     QHash<QString, AgentInstanceInfo> mAgentInstances;
 
-    org::kde::Akonadi::Tracer *mTracer;
+    org::freedesktop::Akonadi::Tracer *mTracer;
 
     Akonadi::ProcessControl *mStorageController;
 };
--- server/control/agentinfo.h	
+++ server/control/agentinfo.h	
@@ -66,9 +66,9 @@ class AgentInstanceInfo
     QString identifier;
     QString agentType;
     Akonadi::ProcessControl *controller;
-    org::kde::Akonadi::Agent::Control *agentControlInterface;
-    org::kde::Akonadi::Agent::Status *agentStatusInterface;
-    org::kde::Akonadi::Resource *resourceInterface;
+    org::freedesktop::Akonadi::Agent::Control *agentControlInterface;
+    org::freedesktop::Akonadi::Agent::Status *agentStatusInterface;
+    org::freedesktop::Akonadi::Resource *resourceInterface;
 };
 
 
--- server/control/org.freedesktop.Akonadi.Control.service.cmake	
+++ server/control/org.freedesktop.Akonadi.Control.service.cmake	
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.Akonadi.Control
+Exec=${BIN_INSTALL_DIR}/akonadi_control
--- server/control/main.cpp	
+++ server/control/main.cpp	
@@ -49,7 +49,7 @@ int main( int argc, char **argv )
 
   QCoreApplication app( argc, argv );
 
-  if ( !QDBusConnection::sessionBus().registerService( "org.kde.Akonadi.Control" ) ) {
+  if ( !QDBusConnection::sessionBus().registerService( "org.freedesktop.Akonadi.Control" ) ) {
     qDebug( "Unable to register service: %s", qPrintable( QDBusConnection::sessionBus().lastError().message() ) );
     return 1;
   }
--- server/control/agentmanager.cpp	
+++ server/control/agentmanager.cpp	
@@ -41,12 +41,12 @@ AgentManager::AgentManager( QObject *par
   new AgentManagerAdaptor( this );
   QDBusConnection::sessionBus().registerObject( "/AgentManager", this );
 
-  mTracer = new org::kde::Akonadi::Tracer( "org.kde.Akonadi", "/tracing", QDBusConnection::sessionBus(), this );
+  mTracer = new org::freedesktop::Akonadi::Tracer( "org.freedesktop.Akonadi", "/tracing", QDBusConnection::sessionBus(), this );
 
   connect( QDBusConnection::sessionBus().interface(), SIGNAL( serviceOwnerChanged( const QString&, const QString&, const QString& ) ),
            this, SLOT( serviceOwnerChanged( const QString&, const QString&, const QString& ) ) );
 
-  if ( QDBusConnection::sessionBus().interface()->isServiceRegistered( "org.kde.Akonadi" ) )
+  if ( QDBusConnection::sessionBus().interface()->isServiceRegistered( "org.freedesktop.Akonadi" ) )
     qFatal( "akonadiserver already running!" );
 
   mStorageController = new Akonadi::ProcessControl;
@@ -65,7 +65,7 @@ void AgentManager::continueStartup()
 
   QStringList pathList = pluginInfoPathList();
 
-  foreach ( QString path, pathList ) {
+  foreach ( const QString &path, pathList ) {
     QFileSystemWatcher *watcher = new QFileSystemWatcher( this );
     watcher->addPath( path );
 
@@ -74,7 +74,7 @@ void AgentManager::continueStartup()
   }
 
   load();
-  foreach ( const AgentInfo info, mAgents )
+  foreach ( const AgentInfo &info, mAgents )
     ensureAutoStart( info );
 }
 
@@ -85,7 +85,7 @@ AgentManager::~AgentManager()
 
 void AgentManager::cleanup()
 {
-  foreach ( const AgentInstanceInfo info, mAgentInstances ) {
+  foreach ( const AgentInstanceInfo &info, mAgentInstances ) {
     info.controller->setCrashPolicy( ProcessControl::StopOnCrash );
     if ( info.agentControlInterface && info.agentControlInterface->isValid() )
       info.agentControlInterface->quit();
@@ -94,8 +94,9 @@ void AgentManager::cleanup()
   mAgentInstances.clear();
 
   mStorageController->setCrashPolicy( ProcessControl::StopOnCrash );
-  org::kde::Akonadi::Server *serverIface = new org::kde::Akonadi::Server( "org.kde.Akonadi", "/Server",
-                                                                          QDBusConnection::sessionBus(), this );
+  org::freedesktop::Akonadi::Server *serverIface =
+    new org::freedesktop::Akonadi::Server( "org.freedesktop.Akonadi", "/Server",
+                                           QDBusConnection::sessionBus(), this );
   serverIface->quit();
 
   delete mStorageController;
@@ -311,12 +312,12 @@ void AgentManager::updatePluginInfos()
   QHash<QString, AgentInfo> oldInfos = mAgents;
   readPluginInfos();
 
-  foreach ( const AgentInfo oldInfo, oldInfos ) {
+  foreach ( const AgentInfo &oldInfo, oldInfos ) {
     if ( !mAgents.contains( oldInfo.identifier ) )
       emit agentTypeRemoved( oldInfo.identifier );
   }
 
-  foreach ( const AgentInfo newInfo, mAgents ) {
+  foreach ( const AgentInfo &newInfo, mAgents ) {
     if ( !oldInfos.contains( newInfo.identifier ) ) {
       emit agentTypeAdded( newInfo.identifier );
       ensureAutoStart( newInfo );
@@ -330,7 +331,7 @@ void AgentManager::readPluginInfos()
 
   QStringList pathList = pluginInfoPathList();
 
-  foreach ( QString path, pathList ) {
+  foreach ( const QString &path, pathList ) {
       QDir directory( path, "*.desktop" );
       readPluginInfos( directory );
   }
@@ -416,12 +417,12 @@ void AgentManager::save()
   QSettings file( configPath( true ), QSettings::IniFormat );
 
   file.clear();
-  foreach ( const AgentInfo info, mAgents )
+  foreach ( const AgentInfo &info, mAgents )
     info.save( &file );
 
   file.beginGroup( "Instances" );
 
-  foreach ( const AgentInstanceInfo info, mAgentInstances ) {
+  foreach ( const AgentInstanceInfo &info, mAgentInstances ) {
     file.beginGroup( info.identifier );
     file.setValue( "AgentType", info.agentType );
     file.endGroup();
@@ -434,16 +435,16 @@ void AgentManager::save()
 
 void AgentManager::serviceOwnerChanged( const QString &name, const QString&, const QString &newOwner )
 {
-  if ( name == "org.kde.Akonadi" && !newOwner.isEmpty() ) {
+  if ( name == "org.freedesktop.Akonadi" && !newOwner.isEmpty() ) {
     // server is operational, start agents
     continueStartup();
   }
 
-  if ( name.startsWith( "org.kde.Akonadi.Agent." ) ) {
+  if ( name.startsWith( "org.freedesktop.Akonadi.Agent." ) ) {
     if ( newOwner.isEmpty() )
       return;
 
-    const QString identifier = name.mid( 22 );
+    const QString identifier = name.mid( 30 );
     if ( !mAgentInstances.contains( identifier ) )
       return;
 
@@ -453,8 +454,9 @@ void AgentManager::serviceOwnerChanged(
     mAgentInstances[ identifier ].agentControlInterface = 0;
     mAgentInstances[ identifier ].agentStatusInterface = 0;
 
-    org::kde::Akonadi::Agent::Control *agentControlIface = new org::kde::Akonadi::Agent::Control( "org.kde.Akonadi.Agent." + identifier,
-        "/", QDBusConnection::sessionBus(), this );
+    org::freedesktop::Akonadi::Agent::Control *agentControlIface =
+      new org::freedesktop::Akonadi::Agent::Control( "org.freedesktop.Akonadi.Agent." + identifier,
+                                                     "/", QDBusConnection::sessionBus(), this );
     if ( !agentControlIface || !agentControlIface->isValid() ) {
       mTracer->error( QLatin1String( "AgentManager::resourceRegistered" ),
                       QString( "Cannot connect to agent instance with identifier '%1', error message: '%2'" )
@@ -466,8 +468,9 @@ void AgentManager::serviceOwnerChanged(
     mAgentInstances[ identifier ].agentControlInterface = agentControlIface;
 
 
-    org::kde::Akonadi::Agent::Status *agentStatusIface = new org::kde::Akonadi::Agent::Status( "org.kde.Akonadi.Agent." + identifier,
-        "/", QDBusConnection::sessionBus(), this );
+    org::freedesktop::Akonadi::Agent::Status *agentStatusIface =
+      new org::freedesktop::Akonadi::Agent::Status( "org.freedesktop.Akonadi.Agent." + identifier,
+                                                    "/", QDBusConnection::sessionBus(), this );
     if ( !agentStatusIface || !agentStatusIface->isValid() ) {
       mTracer->error( QLatin1String( "AgentManager::resourceRegistered" ),
                       QString( "Cannot connect to agent instance with identifier '%1', error message: '%2'" )
@@ -491,18 +494,20 @@ void AgentManager::serviceOwnerChanged(
       emit agentInstanceAdded( identifier );
   }
 
-  else if ( name.startsWith( "org.kde.Akonadi.Resource." ) ) {
+  else if ( name.startsWith( "org.freedesktop.Akonadi.Resource." ) ) {
     if ( newOwner.isEmpty() )
       return;
 
-    const QString identifier = name.mid( 25 );
+    const QString identifier = name.mid( 33 );
     if ( !mAgentInstances.contains( identifier ) )
       return;
 
     delete mAgentInstances[ identifier ].resourceInterface;
     mAgentInstances[ identifier ].resourceInterface = 0;
 
-    org::kde::Akonadi::Resource *resInterface = new org::kde::Akonadi::Resource( "org.kde.Akonadi.Resource." + identifier, "/", QDBusConnection::sessionBus(), this );
+    org::freedesktop::Akonadi::Resource *resInterface =
+      new org::freedesktop::Akonadi::Resource( "org.freedesktop.Akonadi.Resource." + identifier,
+                                               "/", QDBusConnection::sessionBus(), this );
 
     if ( !resInterface || !resInterface->isValid() ) {
       mTracer->error( QLatin1String( "AgentManager::resourceRegistered" ),
@@ -520,7 +525,7 @@ void AgentManager::serviceOwnerChanged(
 
 void AgentManager::status( int status, const QString &message )
 {
-  org::kde::Akonadi::Agent::Status *interface = static_cast<org::kde::Akonadi::Agent::Status*>( sender() );
+  org::freedesktop::Akonadi::Agent::Status *interface = dynamic_cast<org::freedesktop::Akonadi::Agent::Status*>( sender() );
   if ( !interface ) {
     mTracer->error( QLatin1String( "AgentManager::status" ),
                     QLatin1String( "Got signal from unknown sender" ) );
@@ -539,7 +544,7 @@ void AgentManager::status( int status, c
 
 void AgentManager::percent( int progress )
 {
-  org::kde::Akonadi::Agent::Status *interface = static_cast<org::kde::Akonadi::Agent::Status*>( sender() );
+  org::freedesktop::Akonadi::Agent::Status *interface = dynamic_cast<org::freedesktop::Akonadi::Agent::Status*>( sender() );
   if ( !interface ) {
     mTracer->error( QLatin1String( "AgentManager::percent" ),
                     QLatin1String( "Got signal from unknown sender" ) );
@@ -558,7 +563,7 @@ void AgentManager::percent( int progress
 
 void AgentManager::warning( const QString &message )
 {
-  org::kde::Akonadi::Agent::Status *interface = static_cast<org::kde::Akonadi::Agent::Status*>( sender() );
+  org::freedesktop::Akonadi::Agent::Status *interface = dynamic_cast<org::freedesktop::Akonadi::Agent::Status*>( sender() );
   if ( !interface ) {
     mTracer->error( QLatin1String( "AgentManager::warning" ),
                     QLatin1String( "Got signal from unknown sender" ) );
@@ -577,7 +582,7 @@ void AgentManager::warning( const QStrin
 
 void AgentManager::error( const QString &message )
 {
-  org::kde::Akonadi::Agent::Status *interface = static_cast<org::kde::Akonadi::Agent::Status*>( sender() );
+  org::freedesktop::Akonadi::Agent::Status *interface = dynamic_cast<org::freedesktop::Akonadi::Agent::Status*>( sender() );
   if ( !interface ) {
     mTracer->error( QLatin1String( "AgentManager::error" ),
                     QLatin1String( "Got signal from unknown sender" ) );
@@ -596,7 +601,7 @@ void AgentManager::error( const QString
 
 void AgentManager::resourceNameChanged( const QString &data )
 {
-  org::kde::Akonadi::Resource *resource = static_cast<org::kde::Akonadi::Resource*>( sender() );
+  org::freedesktop::Akonadi::Resource *resource = dynamic_cast<org::freedesktop::Akonadi::Resource*>( sender() );
   if ( !resource ) {
     mTracer->error( QLatin1String( "AgentManager::resourceNameChanged" ),
                     QLatin1String( "Got signal from unknown sender" ) );
--- server/control/kcrash.cpp	
+++ server/control/kcrash.cpp	
@@ -88,7 +88,11 @@ static void defaultCrashHandler( int sig
       s_shutdownMethod( sig );
   }
 
+#ifdef Q_CC_MINGW
+  _Exit(255);
+#else
   _exit(255);
+#endif
 }
 
 void KCrash::init()
--- server/control/CMakeLists.txt	
+++ server/control/CMakeLists.txt	
@@ -12,7 +12,7 @@ include_directories( BEFORE
 #)
 set( AKONADI_PROTOCOLINTERNALS_LIBS ${akonadiprotocolinternals_LIB_DEPENDS} akonadiprotocolinternals)
 
-set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_ENABLE_EXCEPTIONS}" )
 
 ########### next target ###############
 
@@ -25,23 +25,25 @@ set( control_SRCS
   processcontrol.cpp
 )
 
-qt4_add_dbus_adaptor( control_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces/org.kde.Akonadi.AgentManager.xml agentmanager.h AgentManager )
-qt4_add_dbus_adaptor( control_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/org.kde.Akonadi.ControlManager.xml controlmanager.h ControlManager )
+automoc4(akonadi_control control_SRCS)
+
+qt4_add_dbus_adaptor( control_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces/org.freedesktop.Akonadi.AgentManager.xml agentmanager.h AgentManager )
+qt4_add_dbus_adaptor( control_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/org.freedesktop.Akonadi.ControlManager.xml controlmanager.h ControlManager )
 qt4_add_dbus_interfaces( control_SRCS
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces/org.kde.Akonadi.Tracer.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces/org.kde.Akonadi.Agent.Control.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces/org.kde.Akonadi.Agent.Status.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces/org.kde.Akonadi.Resource.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/org.kde.Akonadi.Server.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces/org.freedesktop.Akonadi.Tracer.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces/org.freedesktop.Akonadi.Agent.Control.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces/org.freedesktop.Akonadi.Agent.Status.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces/org.freedesktop.Akonadi.Resource.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/org.freedesktop.Akonadi.Server.xml
 )
 
 
-kde4_add_executable(akonadi_control NOGUI ${control_SRCS})
+add_executable(akonadi_control ${control_SRCS})
 set_target_properties(akonadi_control PROPERTIES OUTPUT_NAME akonadi_control)
 
 target_link_libraries(akonadi_control ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${AKONADI_PROTOCOLINTERNALS_LIBS})
 
 install(TARGETS akonadi_control DESTINATION ${BIN_INSTALL_DIR})
 
-configure_file(org.kde.Akonadi.Control.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Control.service)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Control.service DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dbus-1/services)
+configure_file(org.freedesktop.Akonadi.Control.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Akonadi.Control.service)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Akonadi.Control.service DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dbus-1/services)
--- server/tests/unittest/CMakeLists.txt	
+++ server/tests/unittest/CMakeLists.txt	
@@ -5,6 +5,8 @@ include_directories( ${CMAKE_CURRENT_BIN
 
 set(handlertest_SRCS handlertest.cpp teststoragebackend.cpp )
 
-kde4_add_unit_test(handlertest TESTNAME akonadi-handlertest ${handlertest_SRCS})
+automoc4(handlertest handlertest_SRCS)
+add_executable(handlertest ${handlertest_SRCS})
+add_test(akonadi-handlertest handlertest)
 
 target_link_libraries(handlertest akonadiprivate ${QT_QTTEST_LIBRARY})
--- server/interfaces/org.kde.Akonadi.Search.xml	
+++ server/interfaces/org.kde.Akonadi.Search.xml	
@@ -1,9 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="org.kde.Akonadi.Search">
-    <method name="createQuery">
-      <arg name="query" type="s" direction="in" />
-      <arg name="queryObject" type="s" direction="out" />
-    </method>
-  </interface>
-</node>
--- server/interfaces/org.kde.Akonadi.SearchQueryIterator.xml	
+++ server/interfaces/org.kde.Akonadi.SearchQueryIterator.xml	
@@ -1,16 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-         "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="org.kde.Akonadi.SearchQueryIterator">
-    <method name="next">
-      <arg name="reply" type="b" direction="out" />
-    </method>
-    <method name="currentUri">
-      <arg name="reply" type="s" direction="out" />
-    </method>
-    <method name="currentScore">
-      <arg name="reply" type="d" direction="out" />
-    </method>
-    <method name="close" />
-  </interface>
-</node>
--- server/interfaces/org.kde.Akonadi.Server.xml	
+++ server/interfaces/org.kde.Akonadi.Server.xml	
@@ -1,6 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="org.kde.Akonadi.Server">
-    <method name="quit"/>
-  </interface>
-</node>
--- server/interfaces/org.kde.Akonadi.TracerNotification.xml	
+++ server/interfaces/org.kde.Akonadi.TracerNotification.xml	
@@ -1,33 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="org.kde.Akonadi.TracerNotification">
-    <signal name="connectionStarted">
-      <arg name="identifier" type="s" direction="out"/>
-      <arg name="msg" type="s" direction="out"/>
-    </signal>
-    <signal name="connectionEnded">
-      <arg name="identifier" type="s" direction="out"/>
-      <arg name="msg" type="s" direction="out"/>
-    </signal>
-    <signal name="connectionDataInput">
-      <arg name="identifier" type="s" direction="out"/>
-      <arg name="msg" type="s" direction="out"/>
-    </signal>
-    <signal name="connectionDataOutput">
-      <arg name="identifier" type="s" direction="out"/>
-      <arg name="msg" type="s" direction="out"/>
-    </signal>
-    <signal name="signalEmitted">
-      <arg name="signalName" type="s" direction="out"/>
-      <arg name="msg" type="s" direction="out"/>
-    </signal>
-    <signal name="warningEmitted">
-      <arg name="componentName" type="s" direction="out"/>
-      <arg name="msg" type="s" direction="out"/>
-    </signal>
-    <signal name="errorEmitted">
-      <arg name="componentName" type="s" direction="out"/>
-      <arg name="msg" type="s" direction="out"/>
-    </signal>
-  </interface>
-</node>
--- server/interfaces/org.kde.Akonadi.ControlManager.xml	
+++ server/interfaces/org.kde.Akonadi.ControlManager.xml	
@@ -1,6 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="org.kde.Akonadi.ControlManager">
-    <method name="shutdown"/>
-  </interface>
-</node>
--- server/interfaces/org.kde.Akonadi.SearchQuery.xml	
+++ server/interfaces/org.kde.Akonadi.SearchQuery.xml	
@@ -1,22 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="org.kde.Akonadi.SearchQuery">
-    <method name="start" />
-
-    <method name="stop" />
-
-    <method name="close" />
-
-    <method name="allHits">
-      <arg name="iterator" type="s" direction="out" />
-    </method>
-
-    <signal name='hitsChanged'>
-      <arg name='uris' type='as' />
-    </signal>
-
-    <signal name='hitsRemoved'>
-      <arg name='uris' type='as' />
-    </signal>
-  </interface>
-</node>
--- server/interfaces/org.freedesktop.Akonadi.ControlManager.xml	
+++ server/interfaces/org.freedesktop.Akonadi.ControlManager.xml	
@@ -0,0 +1,6 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.freedesktop.Akonadi.ControlManager">
+    <method name="shutdown"/>
+  </interface>
+</node>
--- server/interfaces/org.freedesktop.Akonadi.SearchQuery.xml	
+++ server/interfaces/org.freedesktop.Akonadi.SearchQuery.xml	
@@ -0,0 +1,22 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.freedesktop.Akonadi.SearchQuery">
+    <method name="start" />
+
+    <method name="stop" />
+
+    <method name="close" />
+
+    <method name="allHits">
+      <arg name="iterator" type="s" direction="out" />
+    </method>
+
+    <signal name='hitsChanged'>
+      <arg name='uris' type='as' />
+    </signal>
+
+    <signal name='hitsRemoved'>
+      <arg name='uris' type='as' />
+    </signal>
+  </interface>
+</node>
--- server/interfaces/org.freedesktop.Akonadi.Search.xml	
+++ server/interfaces/org.freedesktop.Akonadi.Search.xml	
@@ -0,0 +1,9 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.freedesktop.Akonadi.Search">
+    <method name="createQuery">
+      <arg name="query" type="s" direction="in" />
+      <arg name="queryObject" type="s" direction="out" />
+    </method>
+  </interface>
+</node>
--- server/interfaces/org.freedesktop.Akonadi.SearchQueryIterator.xml	
+++ server/interfaces/org.freedesktop.Akonadi.SearchQueryIterator.xml	
@@ -0,0 +1,16 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.freedesktop.Akonadi.SearchQueryIterator">
+    <method name="next">
+      <arg name="reply" type="b" direction="out" />
+    </method>
+    <method name="currentUri">
+      <arg name="reply" type="s" direction="out" />
+    </method>
+    <method name="currentScore">
+      <arg name="reply" type="d" direction="out" />
+    </method>
+    <method name="close" />
+  </interface>
+</node>
--- server/interfaces/org.freedesktop.Akonadi.Server.xml	
+++ server/interfaces/org.freedesktop.Akonadi.Server.xml	
@@ -0,0 +1,6 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.freedesktop.Akonadi.Server">
+    <method name="quit"/>
+  </interface>
+</node>
--- server/interfaces/org.freedesktop.Akonadi.TracerNotification.xml	
+++ server/interfaces/org.freedesktop.Akonadi.TracerNotification.xml	
@@ -0,0 +1,33 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.freedesktop.Akonadi.TracerNotification">
+    <signal name="connectionStarted">
+      <arg name="identifier" type="s" direction="out"/>
+      <arg name="msg" type="s" direction="out"/>
+    </signal>
+    <signal name="connectionEnded">
+      <arg name="identifier" type="s" direction="out"/>
+      <arg name="msg" type="s" direction="out"/>
+    </signal>
+    <signal name="connectionDataInput">
+      <arg name="identifier" type="s" direction="out"/>
+      <arg name="msg" type="s" direction="out"/>
+    </signal>
+    <signal name="connectionDataOutput">
+      <arg name="identifier" type="s" direction="out"/>
+      <arg name="msg" type="s" direction="out"/>
+    </signal>
+    <signal name="signalEmitted">
+      <arg name="signalName" type="s" direction="out"/>
+      <arg name="msg" type="s" direction="out"/>
+    </signal>
+    <signal name="warningEmitted">
+      <arg name="componentName" type="s" direction="out"/>
+      <arg name="msg" type="s" direction="out"/>
+    </signal>
+    <signal name="errorEmitted">
+      <arg name="componentName" type="s" direction="out"/>
+      <arg name="msg" type="s" direction="out"/>
+    </signal>
+  </interface>
+</node>
--- server/src/xesammanager.cpp	
+++ server/src/xesammanager.cpp	
@@ -82,7 +82,7 @@ void XesamManager::slotHitsAdded(const Q
   QList<QList<QVariant> > results = mInterface->GetHits( search, count );
   qDebug() << "GetHits returned:" << results.count();
   typedef QList<QVariant> VariantList;
-  foreach ( const VariantList list, results ) {
+  foreach ( const VariantList &list, results ) {
     if ( list.isEmpty() )
       continue;
     qint64 itemId = uriToItemId( list.first().toString() );
@@ -100,7 +100,7 @@ void XesamManager::slotHitsRemoved(const
     return;
   QList<QList<QVariant> > results = mInterface->GetHitData( search, hits, QStringList( QLatin1String("uri") ) );
   typedef QList<QVariant> VariantList;
-  foreach ( const VariantList list, results ) {
+  foreach ( const VariantList &list, results ) {
     if ( list.isEmpty() )
       continue;
     qint64 itemId = uriToItemId( list.first().toString() );
@@ -121,7 +121,7 @@ void XesamManager::reloadSearches()
     return;
   }
   Location::List locs = res.locations();
-  foreach ( const Location l, locs ) {
+  foreach ( const Location &l, locs ) {
     addSearch( l );
   }
 }
@@ -168,7 +168,7 @@ void XesamManager::stopSearches()
     return;
   }
   Location::List locs = res.locations();
-  foreach ( const Location l, locs ) {
+  foreach ( const Location &l, locs ) {
     removeSearch( l.id() );
   }
 }
--- server/src/nepomukmanager.h	
+++ server/src/nepomukmanager.h	
@@ -54,10 +54,10 @@ class NepomukManager : public QObject, p
     bool mValid;
     QMutex mMutex;
 
-    QHash<org::kde::Akonadi::SearchQuery*, qint64> mQueryMap;
-    QHash<qint64, org::kde::Akonadi::SearchQuery*> mQueryInvMap;
+    QHash<org::freedesktop::Akonadi::SearchQuery*, qint64> mQueryMap;
+    QHash<qint64, org::freedesktop::Akonadi::SearchQuery*> mQueryInvMap;
 
-    org::kde::Akonadi::Search *mSearchInterface;
+    org::freedesktop::Akonadi::Search *mSearchInterface;
 };
 
 }
--- server/src/notificationmanager.cpp	
+++ server/src/notificationmanager.cpp	
@@ -62,7 +62,7 @@ void NotificationManager::connectDatasto
 
 void NotificationManager::slotNotify(const Akonadi::NotificationMessage::List &msgs)
 {
-  foreach ( const NotificationMessage msg, msgs )
+  foreach ( const NotificationMessage &msg, msgs )
     NotificationMessage::appendAndCompress( mNotifications, msg );
   if ( !mTimer.isActive() )
     mTimer.start();
@@ -72,7 +72,7 @@ void NotificationManager::slotEmitNotifi
 {
   if ( mNotifications.isEmpty() )
     return;
-  foreach ( const NotificationMessage msg, mNotifications ) {
+  foreach ( const NotificationMessage &msg, mNotifications ) {
     Tracer::self()->signal( "NotificationManager::notify", msg.toString() );
   }
   emit notify( mNotifications );
--- server/src/tests/CMakeLists.txt	
+++ server/src/tests/CMakeLists.txt	
@@ -5,11 +5,17 @@ include_directories( ${CMAKE_CURRENT_BIN
 
 set(interpretertest_SRCS interpretertest.cpp ../interpreter.cpp )
 
-kde4_add_unit_test(interpretertest TESTNAME akonadi-interpretertest ${interpretertest_SRCS})
+automoc4(interpretertest interpretertest_SRCS)
+add_executable(interpretertest ${interpretertest_SRCS})
+add_test(akonadi-interpretertest interpretertest)
 
-target_link_libraries(interpretertest ${KDE4_KDECORE_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
+target_link_libraries(interpretertest ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
 
 
-kde4_add_unit_test(querybuildertest TESTNAME akonadi-querybuildertest querybuildertest.cpp)
-target_link_libraries(querybuildertest ${KDE4_KDECORE_LIBS} ${QT_QTCORE_LIBRARY}
-                      ${QT_QTSQL_LIBRARY} ${QT_QTTEST_LIBRARY})
+set(querybuildertest_SRCS querybuildertest.cpp)
+
+automoc4(querybuildertest querybuildertest_SRCS)
+add_executable(querybuildertest ${querybuildertest_SRCS})
+add_test(akonadi-querybuildertest querybuildertest)
+
+target_link_libraries(querybuildertest ${QT_QTCORE_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTTEST_LIBRARY})
--- server/src/storage/akonadidb.xml	
+++ server/src/storage/akonadidb.xml	
@@ -146,6 +146,7 @@
     <column name="name" type="QString" sqltype="VARCHAR(255)" properties="NOT NULL"/>
     <column name="data" type="QByteArray"/>
     <column name="datasize" type="int" properties="NOT NULL"/>
+    <column name="version" type="int" properties="DEFAULT 0"/>
     <index name="pimItemIdNameIndex" columns="pimItemId,name" unique="true"/>
   </table>
 
--- server/src/storage/datastore.h	
+++ server/src/storage/datastore.h	
@@ -32,7 +32,15 @@ class QSqlQuery;
 #include "entities.h"
 #include "notificationcollector.h"
 
-class OrgKdeAkonadiResourceInterface;
+class OrgFreedesktopAkonadiResourceInterface;
+namespace org {
+  namespace freedesktop {
+    namespace Akonadi {
+      typedef ::OrgFreedesktopAkonadiResourceInterface Resource;
+    }
+  }
+}
+
 
 namespace Akonadi {
 
@@ -250,7 +258,7 @@ protected:
     void debugLastDbError( const char* actionDescription ) const;
     void debugLastQueryError( const QSqlQuery &query, const char* actionDescription ) const;
   public:
-    void retrieveDataFromResource( qint64 uid, const QByteArray& remote_id,
+    void retrieveDataFromResource( qint64 uid, const QByteArray& remote_id, const QByteArray& mimeType,
                                          const QString &resource, const QStringList &parts );
     void triggerCollectionSync( const Location &location );
 
@@ -280,7 +288,7 @@ protected:
     /**
       Returns the D-Bus interface of the given resource.
     */
-    OrgKdeAkonadiResourceInterface* resourceInterface( const QString &res );
+    org::freedesktop::Akonadi::Resource *resourceInterface( const QString &res );
 
 private:
     QString m_connectionName;
@@ -303,7 +311,7 @@ private:
     static QString mDbConnectionOptions;
 
     // resource dbus interface cache
-    QHash<QString, OrgKdeAkonadiResourceInterface*> mResourceInterfaceCache;
+    QHash<QString, org::freedesktop::Akonadi::Resource*> mResourceInterfaceCache;
 };
 
 }
--- server/src/storage/querybuilder.cpp	
+++ server/src/storage/querybuilder.cpp	
@@ -127,7 +127,7 @@ bool QueryBuilder::exec()
       Q_ASSERT_X( mUpdateColumns.count() >= 1, "QueryBuilder::exec()", "At least one column needs to be changed" );
       typedef QPair<QString,QVariant> StringVariantPair;
       QStringList updStmts;
-      foreach ( const StringVariantPair p, mUpdateColumns ) {
+      foreach ( const StringVariantPair &p, mUpdateColumns ) {
         QString updStmt = p.first;
         updStmt += QLatin1String( " = " );
         updStmt += bindValue( p.second );
@@ -154,7 +154,7 @@ bool QueryBuilder::exec()
     Q_ASSERT_X( mType == Select, "QueryBuilder::exec()", "Order statements are only valid for SELECT queries" );
     QStringList orderStmts;
     typedef QPair<QString, Query::SortOrder> SortColumnInfo;
-    foreach ( const SortColumnInfo order, mSortColumns ) {
+    foreach ( const SortColumnInfo &order, mSortColumns ) {
       QString orderStmt;
       orderStmt += order.first;
       orderStmt += sortOrderToString( order.second );
@@ -198,7 +198,7 @@ QString QueryBuilder::buildWhereConditio
 {
   if ( !cond.isEmpty() ) {
     QStringList conds;
-    foreach ( const Query::Condition c, cond.subConditions() ) {
+    foreach ( const Query::Condition &c, cond.subConditions() ) {
       conds << buildWhereCondition( c );
     }
     return QLatin1String( "( " ) + conds.join( logicOperatorToString( cond.mCombineOp ) ) + QLatin1String( " )" );
@@ -212,7 +212,7 @@ QString QueryBuilder::buildWhereConditio
           QStringList entries;
           Q_ASSERT_X( !cond.mComparedValue.toStringList().isEmpty(),
                       "QueryBuilder::buildWhereCondition()", "No values given for IN condition." );
-          foreach ( const QString entry, cond.mComparedValue.toStringList() ) {
+          foreach ( const QString &entry, cond.mComparedValue.toStringList() ) {
             entries << bindValue( entry );
           }
           stmt += entries.join( QLatin1String( ", " ) );
--- server/src/storage/datastore.cpp	
+++ server/src/storage/datastore.cpp	
@@ -313,7 +313,7 @@ bool DataStore::appendItemFlags( const P
                                  bool checkIfExists, const Location &loc )
 {
   Flag::List list;
-  foreach ( const QByteArray f, flags ) {
+  foreach ( const QByteArray &f, flags ) {
     Flag flag = Flag::retrieveByName( QString::fromUtf8( f ) );
     if ( !flag.isValid() ) {
       flag = Flag( QString::fromUtf8( f ) );
@@ -425,7 +425,7 @@ bool DataStore::appendMimeTypeForLocatio
     return false;
   QStringList missingMimeTypes = mimeTypes;
 
-  foreach ( const MimeType mt, qb.result() ) {
+  foreach ( const MimeType &mt, qb.result() ) {
     // unique index on n:m relation prevents duplicates, ie. this will fail
     // if this mimetype is already set
     if ( !Location::addMimeType( locationId, mt.id() ) )
@@ -434,7 +434,7 @@ bool DataStore::appendMimeTypeForLocatio
   }
 
   // the MIME type doesn't exist, so we have to add it to the db
-  foreach ( const QString mtName, missingMimeTypes ) {
+  foreach ( const QString &mtName, missingMimeTypes ) {
     qint64 mimeTypeId;
     if ( !appendMimeType( mtName, &mimeTypeId ) )
       return false;
@@ -636,7 +636,7 @@ bool DataStore::cleanupPimItems( const L
   return ok;
 }
 
-void Akonadi::DataStore::retrieveDataFromResource( qint64 uid, const QByteArray& remote_id,
+void Akonadi::DataStore::retrieveDataFromResource( qint64 uid, const QByteArray& remote_id, const QByteArray& mimeType,
                                                    const QString &resource, const QStringList &parts )
 {
   // TODO: error handling
@@ -664,9 +664,9 @@ void Akonadi::DataStore::retrieveDataFro
       qDebug() << "requestItemDelivery(): requested parts:" << parts;
 
       // call the resource
-      org::kde::Akonadi::Resource *interface = resourceInterface( resource );
+      org::freedesktop::Akonadi::Resource *interface = resourceInterface( resource );
       if ( interface )
-        interface->requestItemDelivery( uid, QString::fromUtf8(remote_id), parts );
+        interface->requestItemDelivery( uid, QString::fromUtf8(remote_id), QString::fromUtf8(mimeType), parts );
 
       mPendingItemDeliveriesMutex.lock();
       qDebug() << "requestItemDelivery(): freeing uid" << uid;
@@ -678,7 +678,7 @@ void Akonadi::DataStore::retrieveDataFro
 
 void DataStore::triggerCollectionSync( const Location &location )
 {
-  org::kde::Akonadi::Resource *interface = resourceInterface( location.resource().name() );
+  org::freedesktop::Akonadi::Resource *interface = resourceInterface( location.resource().name() );
   if ( interface )
     interface->synchronizeCollection( location.id() );
 }
@@ -895,17 +895,17 @@ bool Akonadi::DataStore::inTransaction()
   return m_transactionLevel > 0;
 }
 
-org::kde::Akonadi::Resource * Akonadi::DataStore::resourceInterface( const QString &res )
+org::freedesktop::Akonadi::Resource * Akonadi::DataStore::resourceInterface( const QString &res )
 {
-  org::kde::Akonadi::Resource* iface = 0;
+  org::freedesktop::Akonadi::Resource* iface = 0;
   if ( mResourceInterfaceCache.contains( res ) )
     iface = mResourceInterfaceCache.value( res );
   if ( iface && iface->isValid() )
     return iface;
 
   delete iface;
-  iface = new org::kde::Akonadi::Resource( QLatin1String("org.kde.Akonadi.Resource.") + res,
-                                           QLatin1String("/"), QDBusConnection::sessionBus(), this );
+  iface = new org::freedesktop::Akonadi::Resource( QLatin1String("org.freedesktop.Akonadi.Resource.") + res,
+                                                   QLatin1String("/"), QDBusConnection::sessionBus(), this );
   if ( !iface || !iface->isValid() ) {
     qDebug() << QString::fromLatin1( "Cannot connect to agent instance with identifier '%1', error message: '%2'" )
                                     .arg( res, iface ? iface->lastError().message() : QString() );
--- server/src/storage/dbinitializer.cpp	
+++ server/src/storage/dbinitializer.cpp	
@@ -232,7 +232,7 @@ bool DbInitializer::checkTable( const QD
     return false;
   }
   if ( query.size() == 0  || !query.first() ) {
-    foreach ( QString stmt, dataList ) {
+    foreach ( const QString &stmt, dataList ) {
       if ( !query.exec( stmt ) ) {
         mErrorMsg = QString::fromLatin1( "Unable to add initial data to table '%1'." ).arg( tableName );
         mErrorMsg += QString::fromLatin1( "Query was: %1" ).arg( stmt );
--- server/src/main.cpp	
+++ server/src/main.cpp	
@@ -46,7 +46,7 @@ int main( int argc, char ** argv )
 
     Akonadi::AkonadiServer::instance(); // trigger singleton creation
 
-    if ( !QDBusConnection::sessionBus().registerService( QLatin1String("org.kde.Akonadi") ) ) {
+    if ( !QDBusConnection::sessionBus().registerService( QLatin1String("org.freedesktop.Akonadi") ) ) {
       qDebug( "Unable to connect to dbus service: %s", qPrintable( QDBusConnection::sessionBus().lastError().message() ) );
       return 1;
     }
--- server/src/resourcemanager.h	
+++ server/src/resourcemanager.h	
@@ -46,7 +46,7 @@ class ResourceManager : public QObject
 
   private:
     static ResourceManager* mSelf;
-    org::kde::Akonadi::AgentManager *mManager;
+    org::freedesktop::Akonadi::AgentManager *mManager;
 };
 
 }
--- server/src/handler/append.cpp	
+++ server/src/handler/append.cpp	
@@ -98,7 +98,7 @@ bool Akonadi::Append::commit()
     QByteArray mt;
     QByteArray remote_id;
     QList<QByteArray> flags;
-    foreach( QByteArray flag, m_flags ) {
+    foreach( const QByteArray &flag, m_flags ) {
       if ( flag.startsWith( "\\MimeType" ) ) {
         int pos1 = flag.indexOf( '[' );
         int pos2 = flag.indexOf( ']', pos1 );
--- server/src/handler/copy.cpp	
+++ server/src/handler/copy.cpp	
@@ -55,7 +55,7 @@ bool Copy::handleLine(const QByteArray &
   DataStore *store = connection()->storageBackend();
   Transaction transaction( store );
 
-  foreach ( const PimItem item, items ) {
+  foreach ( const PimItem &item, items ) {
     if ( !copyItem( item, loc ) )
       return failureResponse( "Unable to copy item" );
   }
@@ -74,7 +74,7 @@ bool Copy::copyItem(const PimItem & item
   newItem.setRemoteId( QByteArray() );
   newItem.setLocationId( target.id() );
   Part::List parts;
-  foreach ( const Part part, item.parts() ) {
+  foreach ( const Part &part, item.parts() ) {
     Part newPart( part );
     newPart.setPimItemId( -1 );
     parts << newPart;
--- server/src/handler/list.cpp	
+++ server/src/handler/list.cpp	
@@ -65,7 +65,7 @@ bool List::handleLine(const QByteArray&
           return failureResponse( "Unable to find collection" );
         }
 
-        foreach ( Location loc, collections ) {
+        foreach ( const Location &loc, collections ) {
             QByteArray list( "LIST ");
             list += '(';
             bool first = true;
@@ -75,7 +75,7 @@ bool List::handleLine(const QByteArray&
                 first = false;
             }
             bool canContainFolders = false;
-            foreach ( MimeType mt, supportedMimeTypes ) {
+            foreach ( const MimeType &mt, supportedMimeTypes ) {
               if ( mt.name() == QLatin1String("inode/directory") ) {
                 canContainFolders = true;
                 break;
@@ -173,7 +173,7 @@ bool List::listCollections( const QStrin
   else
     locations = Location::retrieveAll();
 
-  foreach( Location l, locations ) {
+  foreach( const Location &l, locations ) {
     const QString location = locationDelimiter + HandlerHelper::pathForCollection( l );
 #if 0
     qDebug() << "Location: " << location << " l: " << l << " prefix: " << fullPrefix;
--- server/src/handler/modify.cpp	
+++ server/src/handler/modify.cpp	
@@ -64,7 +64,7 @@ bool Akonadi::Modify::handleLine(const Q
       if ( !db->removeMimeTypesForLocation( location.id() ) )
         return failureResponse( "Unable to modify collection mimetypes." );
       QStringList mts;
-      foreach ( QByteArray ba, mimeTypes )
+      foreach ( const QByteArray &ba, mimeTypes )
         mts << QString::fromLatin1(ba);
       if ( !db->appendMimeTypeForLocation( location.id(), mts ) )
         return failureResponse( "Unable to modify collection mimetypes." );
--- server/src/handler/store.cpp	
+++ server/src/handler/store.cpp	
@@ -158,9 +158,14 @@ bool Store::handleLine( const QByteArray
             return failureResponse( "Unable to update item dirtyness" );
       } else {
         Part part;
+        int version = 0;
+        QByteArray plainCommand;
+
+        ImapParser::splitVersionedKey( command, plainCommand, version );
+
         SelectQueryBuilder<Part> qb;
         qb.addValueCondition( Part::pimItemIdColumn(), Query::Equals, pimItems[ i ].id() );
-        qb.addValueCondition( Part::nameColumn(), Query::Equals, QString::fromUtf8( command ) );
+        qb.addValueCondition( Part::nameColumn(), Query::Equals, QString::fromUtf8( plainCommand ) );
         if ( !qb.exec() )
           return failureResponse( "Unable to check item part existence" );
         Part::List result = qb.result();
@@ -173,7 +178,8 @@ bool Store::handleLine( const QByteArray
         {
           part.setData( value );
           part.setDatasize( buffer.size() );
-          part.setName( QString::fromUtf8( command ) );
+          part.setName( QString::fromUtf8( plainCommand ) );
+          part.setVersion( version );
           part.setPimItemId( pimItems[ i ].id() );
           if ( part.isValid() ) {
             if ( !part.update() )
--- server/src/handler/create.cpp	
+++ server/src/handler/create.cpp	
@@ -81,7 +81,7 @@ bool Create::handleLine(const QByteArray
     // check if parent can contain a sub-folder
     parentContentTypes = parent.mimeTypes();
     bool found = false;
-    foreach ( const MimeType mt, parentContentTypes ) {
+    foreach ( const MimeType &mt, parentContentTypes ) {
       if ( mt.name() == QLatin1String( "inode/directory" ) ) {
         found = true;
         break;
@@ -135,10 +135,10 @@ bool Create::handleLine(const QByteArray
 
   QStringList effectiveMimeTypes;
   if ( mimeTypesSet ) {
-    foreach ( const QByteArray b, mimeTypes )
+    foreach ( const QByteArray &b, mimeTypes )
       effectiveMimeTypes << QString::fromUtf8( b );
   } else {
-    foreach ( const MimeType mt, parentContentTypes )
+    foreach ( const MimeType &mt, parentContentTypes )
       effectiveMimeTypes << mt.name();
   }
   if ( !db->appendMimeTypeForLocation( location.id(), effectiveMimeTypes ) )
@@ -146,7 +146,7 @@ bool Create::handleLine(const QByteArray
 
   // store user defined attributes
   typedef QPair<QByteArray,QByteArray> QByteArrayPair;
-  foreach ( const QByteArrayPair attr, userDefAttrs ) {
+  foreach ( const QByteArrayPair &attr, userDefAttrs ) {
     if ( !db->addCollectionAttribute( location, attr.first, attr.second ) )
       return failureResponse( "Unable to add collection attribute." );
   }
--- server/src/handler/colcopy.cpp	
+++ server/src/handler/colcopy.cpp	
@@ -65,12 +65,12 @@ bool ColCopy::copyCollection(const Locat
   if ( !db->appendLocation( loc ) )
     return false;
 
-  foreach ( const MimeType mt, source.mimeTypes() ) {
+  foreach ( const MimeType &mt, source.mimeTypes() ) {
     if ( !loc.addMimeType( mt ) )
       return false;
   }
 
-  foreach ( const LocationAttribute attr, source.attributes() ) {
+  foreach ( const LocationAttribute &attr, source.attributes() ) {
     LocationAttribute newAttr = attr;
     newAttr.setId( -1 );
     newAttr.setLocationId( loc.id() );
@@ -79,13 +79,13 @@ bool ColCopy::copyCollection(const Locat
   }
 
   // copy sub-collections
-  foreach ( const Location child, source.children() ) {
+  foreach ( const Location &child, source.children() ) {
     if ( !copyCollection( child, loc ) )
       return false;
   }
 
   // copy items
-  foreach ( const PimItem item, source.items() ) {
+  foreach ( const PimItem &item, source.items() ) {
     if ( !copyItem( item, loc ) )
       return false;
   }
--- server/src/handler/akappend.cpp	
+++ server/src/handler/akappend.cpp	
@@ -81,7 +81,7 @@ bool Akonadi::AkAppend::handleLine(const
     // by the database
 
     // parse part specification
-    QList<QPair<QByteArray, qint64> > partSpecs;
+    QList<QPair<QByteArray, QPair<qint64, int> > > partSpecs;
     QByteArray partName;
     qint64 partSize;
     bool ok;
@@ -98,7 +98,11 @@ bool Akonadi::AkAppend::handleLine(const
       if( !ok )
         partSize = 0;
 
-      partSpecs.append( qMakePair( partName, partSize ) );
+      int version = 0;
+      QByteArray plainPartName;
+      ImapParser::splitVersionedKey( partName, plainPartName, version );
+
+      partSpecs.append( qMakePair( plainPartName, qMakePair( partSize, version ) ) );
     }
 
     QByteArray allParts;
@@ -106,14 +110,16 @@ bool Akonadi::AkAppend::handleLine(const
 
     // chop up literal data in parts
     pos = 0; // traverse through part data now
-    QPair<QByteArray, qint64> partSpec;
+    QPair<QByteArray, QPair<qint64, int> > partSpec;
     foreach( partSpec, partSpecs ) {
       // wrap data into a part
       Part part;
       part.setName( QLatin1String( partSpec.first ) );
-      part.setData( allParts.mid( pos, partSpec.second ) );
+      part.setData( allParts.mid( pos, partSpec.second.first ) );
+      if ( partSpec.second.second != 0 )
+        part.setVersion( partSpec.second.second );
       m_parts.append( part );
-      pos += partSpec.second;
+      pos += partSpec.second.first;
     }
 
     return commit();
@@ -133,7 +139,7 @@ bool Akonadi::AkAppend::commit()
     QByteArray mt;
     QByteArray remote_id;
     QList<QByteArray> flags;
-    foreach( QByteArray flag, m_flags ) {
+    foreach( const QByteArray &flag, m_flags ) {
       if ( flag.startsWith( "\\MimeType" ) ) {
         int pos1 = flag.indexOf( '[' );
         int pos2 = flag.indexOf( ']', pos1 );
--- server/src/handler/aklist.cpp	
+++ server/src/handler/aklist.cpp	
@@ -113,7 +113,7 @@ bool AkList::listCollection(const Locati
   bool childrenFound = false;
   if ( depth > 0 ) {
     Location::List children = root.children();
-    foreach ( const Location loc, children ) {
+    foreach ( const Location &loc, children ) {
       if ( listCollection( loc, depth - 1 ) )
         childrenFound = true;
     }
--- server/src/handler/fetch.cpp	
+++ server/src/handler/fetch.cpp	
@@ -156,7 +156,7 @@ bool Fetch::handleLine( const QByteArray
   // build part query if needed
   QueryBuilder partQuery;
   QStringList partList;
-  foreach( const QByteArray b, mAttrList ) {
+  foreach( const QByteArray &b, mAttrList ) {
     // filter out non-part attributes
     if ( b == "REV" || b == "FLAGS" || b == "UID" || b == "REMOTEID" || b.startsWith( "akonadi-" ) )
       continue;
@@ -174,6 +174,7 @@ bool Fetch::handleLine( const QByteArray
   const int partQueryIdColumn = 0;
   const int partQueryNameColumn = 1;
   const int partQueryDataColumn = 2;
+  const int partQueryVersionColumn = 3;
 
   // fetch not yet cached item parts
   // TODO: I'm sure this can be done with a single query instead of manually
@@ -201,6 +202,7 @@ bool Fetch::handleLine( const QByteArray
       }
       if ( !missingParts.isEmpty() ) {
         store->retrieveDataFromResource( pimItemId, itemQuery.query().value( itemQueryRidColumn ).toString().toUtf8(),
+                                         itemQuery.query().value( itemQueryMimeTypeColumn ).toString().toUtf8(),
                                          itemQuery.query().value( itemQueryResouceColumn ).toString(), missingParts );
       }
       itemQuery.query().next();
@@ -253,6 +255,10 @@ bool Fetch::handleLine( const QByteArray
       QByteArray partName = partQuery.query().value( partQueryNameColumn ).toString().toUtf8();
       QByteArray part = partQuery.query().value( partQueryNameColumn ).toString().toUtf8();
       QByteArray data = partQuery.query().value( partQueryDataColumn ).toByteArray();
+      int version = partQuery.query().value( partQueryVersionColumn ).toInt();
+      if ( version != 0 ) { // '0' is the default, so don't send it
+        part += "[" + QByteArray::number( version ) + "]";
+      }
       if ( data.isNull() ) {
         part += " NIL";
       } else if ( data.isEmpty() ) {
@@ -329,6 +335,7 @@ QueryBuilder Fetch::buildPartQuery( cons
     partQuery.addColumn( PimItem::idFullColumnName() );
     partQuery.addColumn( Part::nameFullColumnName() );
     partQuery.addColumn( Part::dataFullColumnName() );
+    partQuery.addColumn( Part::versionFullColumnName() );
     partQuery.addColumnCondition( PimItem::idFullColumnName(), Query::Equals, Part::pimItemIdFullColumnName() );
     if ( !mAllParts )
       partQuery.addValueCondition( Part::nameFullColumnName(), Query::In, partList );
--- server/src/cachecleaner.cpp	
+++ server/src/cachecleaner.cpp	
@@ -78,10 +78,10 @@ void CacheCleaner::cleanCache()
     qDebug() << "found" << parts.count() << "item parts to expire in collection" << location.name();
 
     // clear data field
-    foreach ( Part part, parts ) {
-      part.setData( QByteArray() );
-      if ( !part.update() )
-        qDebug() << "failed to update item part" << part.id();
+    for ( int i = 0; i < parts.count(); ++i) {
+      parts[ i ].setData( QByteArray() );
+      if ( !parts[ i ].update() )
+        qDebug() << "failed to update item part" << parts[ i ].id();
     }
   }
 
--- server/src/nepomukmanager.cpp	
+++ server/src/nepomukmanager.cpp	
@@ -51,8 +51,8 @@ NepomukManager::NepomukManager( QObject*
   Q_ASSERT( mInstance == 0 );
   mInstance = this;
 
-  mSearchInterface = new org::kde::Akonadi::Search( QLatin1String( "org.kde.Akonadi.Search" ), QLatin1String( "/Search" ),
-                                                    QDBusConnection::sessionBus(), this );
+  mSearchInterface = new org::freedesktop::Akonadi::Search( QLatin1String( "org.freedesktop.Akonadi.Search" ), QLatin1String( "/Search" ),
+                                                            QDBusConnection::sessionBus(), this );
 
   if ( !mSearchInterface->isValid() ) {
     qWarning() << "Nepomuk QueryServer interface not found!";
@@ -78,8 +78,9 @@ bool NepomukManager::addSearch( const Lo
   const QString searchStatement = location.remoteId();
 
   const QString queryPath = mSearchInterface->createQuery( searchStatement );
-  org::kde::Akonadi::SearchQuery *query = new org::kde::Akonadi::SearchQuery( QLatin1String( "org.kde.Akonadi.Search" ),
-                                                                              queryPath, QDBusConnection::sessionBus(), 0 );
+  org::freedesktop::Akonadi::SearchQuery *query =
+    new org::freedesktop::Akonadi::SearchQuery( QLatin1String( "org.freedesktop.Akonadi.Search" ),
+                                                queryPath, QDBusConnection::sessionBus(), 0 );
 
   if ( !query->isValid() ) {
     qWarning() << "Nepomuk QueryServer: Query could not be instantiated!";
@@ -97,9 +98,9 @@ bool NepomukManager::addSearch( const Lo
   // load all hits that are currently available...
   const QString iteratorPath = query->allHits();
 
-  org::kde::Akonadi::SearchQueryIterator *iterator =
-                  new org::kde::Akonadi::SearchQueryIterator( QLatin1String( "org.kde.Akonadi.Search" ), iteratorPath,
-                                                              QDBusConnection::sessionBus(), 0 );
+  org::freedesktop::Akonadi::SearchQueryIterator *iterator =
+    new org::freedesktop::Akonadi::SearchQueryIterator( QLatin1String( "org.freedesktop.Akonadi.Search" ), iteratorPath,
+                                                        QDBusConnection::sessionBus(), 0 );
 
   while ( iterator->next() ) {
     const QString uri = iterator->currentUri();
@@ -125,7 +126,7 @@ bool NepomukManager::addSearch( const Lo
 
 bool NepomukManager::removeSearch( qint64 locationId )
 {
-  org::kde::Akonadi::SearchQuery *query = mQueryInvMap.value( locationId );
+  org::freedesktop::Akonadi::SearchQuery *query = mQueryInvMap.value( locationId );
   if ( !query || !query->isValid() ) {
     qWarning() << "Nepomuk QueryServer: Query could not be removed!";
   } else {
@@ -151,7 +152,7 @@ void NepomukManager::reloadSearches()
   }
 
   const Location::List locations = resource.locations();
-  Q_FOREACH ( const Location location, locations ) {
+  Q_FOREACH ( const Location &location, locations ) {
     addSearch( location );
   }
 }
@@ -165,7 +166,7 @@ void NepomukManager::stopSearches()
   }
 
   const Location::List locations = resource.locations();
-  Q_FOREACH ( const Location location, locations ) {
+  Q_FOREACH ( const Location &location, locations ) {
     removeSearch( location.id() );
   }
 }
@@ -174,7 +175,7 @@ void NepomukManager::hitsAdded( const QS
 {
   qDebug( "--------------- hits added 1" );
 
-  org::kde::Akonadi::SearchQuery *query = qobject_cast<org::kde::Akonadi::SearchQuery*>( sender() );
+  org::freedesktop::Akonadi::SearchQuery *query = qobject_cast<org::freedesktop::Akonadi::SearchQuery*>( sender() );
   if ( !query ) {
     qWarning() << "Nepomuk QueryServer: Got signal from non-existing search query!";
     return;
@@ -186,7 +187,7 @@ void NepomukManager::hitsAdded( const QS
   qint64 locationId = mQueryMap.value( query );
   mMutex.unlock();
 
-  Q_FOREACH( const QString uri, hits ) {
+  Q_FOREACH( const QString &uri, hits ) {
     const qint64 itemId = uriToItemId( uri );
 
     if ( itemId == -1 ) {
@@ -202,7 +203,7 @@ void NepomukManager::hitsRemoved( const
 {
   qDebug( "--------------- hits removed 1" );
 
-  org::kde::Akonadi::SearchQuery *query = qobject_cast<org::kde::Akonadi::SearchQuery*>( sender() );
+  org::freedesktop::Akonadi::SearchQuery *query = qobject_cast<org::freedesktop::Akonadi::SearchQuery*>( sender() );
   if ( !query ) {
     qWarning() << "Nepomuk QueryServer: Got signal from non-existing search query!";
     return;
@@ -214,7 +215,7 @@ void NepomukManager::hitsRemoved( const
   qint64 locationId = mQueryMap.value( query );
   mMutex.unlock();
 
-  Q_FOREACH( const QString uri, hits ) {
+  Q_FOREACH( const QString &uri, hits ) {
     const qint64 itemId = uriToItemId( uri );
 
     if ( itemId == -1 ) {
--- server/src/handlerhelper.cpp	
+++ server/src/handlerhelper.cpp	
@@ -48,7 +48,7 @@ Location HandlerHelper::collectionFromId
 
   const QStringList pathParts = path.split( QLatin1Char('/') );
   Location loc;
-  foreach ( const QString part, pathParts ) {
+  foreach ( const QString &part, pathParts ) {
     SelectQueryBuilder<Location> qb;
     qb.addValueCondition( Location::nameColumn(), Query::Equals, part );
     if ( loc.isValid() )
@@ -131,7 +131,7 @@ int HandlerHelper::parseCachePolicy(cons
       QList<QByteArray> tmp;
       QStringList parts;
       Akonadi::ImapParser::parseParenthesizedList( value, tmp );
-      foreach ( const QByteArray ba, tmp )
+      foreach ( const QByteArray &ba, tmp )
         parts << QString::fromLatin1( ba );
       loc.setCachePolicyLocalParts( parts.join( QLatin1String(" ") ) );
     }
@@ -168,7 +168,7 @@ QByteArray HandlerHelper::collectionToBy
   b += HandlerHelper::cachePolicyToByteArray( loc ) + ' ';
 
   LocationAttribute::List attrs = loc.attributes();
-  foreach ( const LocationAttribute attr, attrs )
+  foreach ( const LocationAttribute &attr, attrs )
     b += attr.type() + ' ' + ImapParser::quote( attr.value() );
   b+= ')';
 
--- server/src/resourcemanager.cpp	
+++ server/src/resourcemanager.cpp	
@@ -30,7 +30,7 @@ ResourceManager* ResourceManager::mSelf
 Akonadi::ResourceManager::ResourceManager(QObject * parent) :
   QObject( parent )
 {
-  mManager = new org::kde::Akonadi::AgentManager( QLatin1String("org.kde.Akonadi.Control"),
+  mManager = new org::freedesktop::Akonadi::AgentManager( QLatin1String("org.freedesktop.Akonadi.Control"),
       QLatin1String("/AgentManager"), QDBusConnection::sessionBus(), this );
 
   connect( mManager, SIGNAL(agentInstanceAdded(const QString&)),
--- server/src/notificationmanager.h	
+++ server/src/notificationmanager.h	
@@ -35,7 +35,7 @@ namespace Akonadi {
 class NotificationManager : public QObject
 {
   Q_OBJECT
-  Q_CLASSINFO( "D-Bus Interface", "org.kde.Akonadi.NotificationManager" )
+  Q_CLASSINFO( "D-Bus Interface", "org.freedesktop.Akonadi.NotificationManager" )
 
   public:
     static NotificationManager *self();
--- server/akonadictl/main.cpp	
+++ server/akonadictl/main.cpp	
@@ -52,7 +52,7 @@ static bool startServer()
 
 static bool stopServer()
 {
-  org::kde::Akonadi::ControlManager iface( AKONADI_DBUS_CONTROL_SERVICE, "/ControlManager", QDBusConnection::sessionBus(), 0 );
+  org::freedesktop::Akonadi::ControlManager iface( AKONADI_DBUS_CONTROL_SERVICE, "/ControlManager", QDBusConnection::sessionBus(), 0 );
   iface.shutdown();
 
   return true;
--- server/akonadictl/CMakeLists.txt	
+++ server/akonadictl/CMakeLists.txt	
@@ -3,7 +3,7 @@ include_directories(
   ${QT_QTDBUS_INCLUDE_DIR}
 )
 
-set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_ENABLE_EXCEPTIONS}" )
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 ########### next target ###############
 
@@ -12,11 +12,13 @@ set( akonadictl_SRCS
   main.cpp
 )
 
+automoc4(akonadictl akonadictl_SRCS)
+
 qt4_add_dbus_interfaces( akonadictl_SRCS
-  ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/org.kde.Akonadi.ControlManager.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/org.freedesktop.Akonadi.ControlManager.xml
 )
 
-kde4_add_executable(akonadictl NOGUI ${akonadictl_SRCS})
+add_executable(akonadictl ${akonadictl_SRCS})
 set_target_properties(akonadictl PROPERTIES OUTPUT_NAME akonadictl)
 
 target_link_libraries(akonadictl ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY})
--- server/queryserver/org.kde.Akonadi.Search.service.cmake	
+++ server/queryserver/org.kde.Akonadi.Search.service.cmake	
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.kde.Akonadi.Search
+Name=org.freedesktop.Akonadi.Search
 Exec=${BIN_INSTALL_DIR}/akonadi_queryserver
--- server/queryserver/queryservertest.h	
+++ server/queryserver/queryservertest.h	
@@ -38,8 +38,8 @@ class TestObject : public QObject
     void hitsRemoved( const QMap<QString, double> &hits );
 
   private:
-    org::kde::Akonadi::Search *mSearch;
-    org::kde::Akonadi::SearchQuery *mQuery;
+    org::freedesktop::Akonadi::Search *mSearch;
+    org::freedesktop::Akonadi::SearchQuery *mQuery;
 };
 
 #endif
--- server/queryserver/main.cpp	
+++ server/queryserver/main.cpp	
@@ -27,7 +27,7 @@ int main( int argc, char **argv )
 {
   QCoreApplication app( argc, argv );
 
-  if ( !QDBusConnection::sessionBus().registerService( "org.kde.Akonadi.Search" ) ) {
+  if ( !QDBusConnection::sessionBus().registerService( "org.freedesktop.Akonadi.Search" ) ) {
     qDebug( "Unable to register service: %s", qPrintable( QDBusConnection::sessionBus().lastError().message() ) );
     return 1;
   }
--- server/queryserver/query.cpp	
+++ server/queryserver/query.cpp	
@@ -104,7 +104,7 @@ void Query::Private::_k_statementsRemove
    * Create result map.
    */
   QList<QString> uris;
-  Q_FOREACH( const QString uri, tmp )
+  Q_FOREACH( const QString &uri, tmp )
     uris.append( uri );
 
   mQueryTime = QDateTime::currentDateTime();
--- server/queryserver/CMakeLists.txt	
+++ server/queryserver/CMakeLists.txt	
@@ -4,7 +4,7 @@ include_directories(
   ${SOPRANO_INCLUDE_DIR}
 )
 
-set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_ENABLE_EXCEPTIONS}" )
 
 ########### next target ###############
 
@@ -15,32 +15,32 @@ set( queryserver_SRCS
   search.cpp
 )
 
-qt4_add_dbus_adaptor( queryserver_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/org.kde.Akonadi.Search.xml search.h Search )
-qt4_add_dbus_adaptor( queryserver_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/org.kde.Akonadi.SearchQuery.xml query.h Query )
-qt4_add_dbus_adaptor( queryserver_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/org.kde.Akonadi.SearchQueryIterator.xml queryiterator.h QueryIterator )
+qt4_add_dbus_adaptor( queryserver_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/org.freedesktop.Akonadi.Search.xml search.h Search )
+qt4_add_dbus_adaptor( queryserver_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/org.freedesktop.Akonadi.SearchQuery.xml query.h Query )
+qt4_add_dbus_adaptor( queryserver_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/org.freedesktop.Akonadi.SearchQueryIterator.xml queryiterator.h QueryIterator )
 
-kde4_add_executable( akonadi_queryserver NOGUI ${queryserver_SRCS} )
+add_executable( akonadi_queryserver ${queryserver_SRCS} )
 set_target_properties( akonadi_queryserver PROPERTIES OUTPUT_NAME akonadi_queryserver )
 
 target_link_libraries( akonadi_queryserver ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${NEPOMUK_LIBRARY} )
 
 install( TARGETS akonadi_queryserver DESTINATION ${BIN_INSTALL_DIR} )
 
-configure_file( org.kde.Akonadi.Search.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Search.service )
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Search.service DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dbus-1/services )
+configure_file( org.freedesktop.Akonadi.Search.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Akonadi.Search.service )
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Akonadi.Search.service DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dbus-1/services )
 
 ########### next target ###############
 
-qt4_add_dbus_interface( queryservertestdbus_SRCS ../interfaces/org.kde.Akonadi.Search.xml searchinterface )
-qt4_add_dbus_interface( queryservertestdbus_SRCS ../interfaces/org.kde.Akonadi.SearchQuery.xml searchqueryinterface )
-qt4_add_dbus_interface( queryservertestdbus_SRCS ../interfaces/org.kde.Akonadi.SearchQueryIterator.xml searchqueryiteratorinterface )
+qt4_add_dbus_interface( queryservertestdbus_SRCS ../interfaces/org.freedesktop.Akonadi.Search.xml searchinterface )
+qt4_add_dbus_interface( queryservertestdbus_SRCS ../interfaces/org.freedesktop.Akonadi.SearchQuery.xml searchqueryinterface )
+qt4_add_dbus_interface( queryservertestdbus_SRCS ../interfaces/org.freedesktop.Akonadi.SearchQueryIterator.xml searchqueryiteratorinterface )
 
 set( queryservertest_SRCS
   queryservertest.cpp
   ${queryservertestdbus_SRCS}
 )
 
-kde4_add_executable( akonadi_queryservertest NOGUI ${queryservertest_SRCS} )
+add_executable( akonadi_queryservertest ${queryservertest_SRCS} )
 set_target_properties( akonadi_queryservertest PROPERTIES OUTPUT_NAME akonadi_queryservertest )
 
 target_link_libraries( akonadi_queryservertest ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${NEPOMUK_LIBRARY} ${SOPRANO_LIBRARY} )
--- server/queryserver/queryservertest.cpp	
+++ server/queryserver/queryservertest.cpp	
@@ -28,16 +28,17 @@
 TestObject::TestObject( const QString &query, QObject *parent )
   : QObject( parent )
 {
-  mSearch = new org::kde::Akonadi::Search( "org.kde.Akonadi.Search", "/Search", QDBusConnection::sessionBus(), this );
+  mSearch = new org::freedesktop::Akonadi::Search( "org.freedesktop.Akonadi.Search", "/Search", QDBusConnection::sessionBus(), this );
 
   const QString queryPath = mSearch->createQuery( query );
 
-  mQuery = new org::kde::Akonadi::SearchQuery( "org.kde.Akonadi.Search", queryPath, QDBusConnection::sessionBus(), this );
+  mQuery = new org::freedesktop::Akonadi::SearchQuery( "org.freedesktop.Akonadi.Search", queryPath, QDBusConnection::sessionBus(), this );
 
   const QString iteratorPath = mQuery->allHits();
 
-  org::kde::Akonadi::SearchQueryIterator *iterator = new org::kde::Akonadi::SearchQueryIterator( "org.kde.Akonadi.Search", iteratorPath,
-                                                                         QDBusConnection::sessionBus(), this );
+  org::freedesktop::Akonadi::SearchQueryIterator *iterator =
+    new org::freedesktop::Akonadi::SearchQueryIterator( "org.freedesktop.Akonadi.Search", iteratorPath,
+                                                        QDBusConnection::sessionBus(), this );
   while ( iterator->next() ) {
     QString data = iterator->currentUri();
     qDebug("  %s", qPrintable( data ) );
--- server/CMakeLists.txt	
+++ server/CMakeLists.txt	
@@ -18,18 +18,13 @@ include_directories( ${CMAKE_CURRENT_SOU
 include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/tests )
 include_directories( ${QT_QTDBUS_INCLUDE_DIR} )
 
-# FIXME: remove once the server has been moved to kdesupport
-# currently needed because library akonadiprotocolinternals is
-# installed by kdepimlibs
-link_directories( ${KDE4_LIB_DIR} )
-
 add_subdirectory( akonadictl )
 add_subdirectory( control )
 add_subdirectory( src )
 #add_subdirectory( queryserver )
 add_subdirectory( tests )
 
-set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" )
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_ENABLE_EXCEPTIONS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" )
 if ( MYSQLD_EXECUTABLE )
   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMYSQLD_EXECUTABLE=\"\\\"${MYSQLD_EXECUTABLE}\\\"\"" )
 endif ( MYSQLD_EXECUTABLE )
@@ -103,28 +98,30 @@ set(libakonadiprivate_SRCS
   src/nepomukmanager.cpp
 )
 
-qt4_add_dbus_adaptor( libakonadiprivate_SRCS interfaces/org.kde.Akonadi.TracerNotification.xml dbustracer.h Akonadi::DBusTracer )
-qt4_add_dbus_adaptor( libakonadiprivate_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/org.kde.Akonadi.Tracer.xml tracer.h Akonadi::Tracer
+automoc4(akonadiprivate libakonadiprivate_SRCS)
+
+qt4_add_dbus_adaptor( libakonadiprivate_SRCS interfaces/org.freedesktop.Akonadi.TracerNotification.xml dbustracer.h Akonadi::DBusTracer )
+qt4_add_dbus_adaptor( libakonadiprivate_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/org.freedesktop.Akonadi.Tracer.xml tracer.h Akonadi::Tracer
 )
-qt4_add_dbus_adaptor( libakonadiprivate_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/org.kde.Akonadi.NotificationManager.xml notificationmanager.h Akonadi::NotificationManager )
+qt4_add_dbus_adaptor( libakonadiprivate_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/org.freedesktop.Akonadi.NotificationManager.xml notificationmanager.h Akonadi::NotificationManager )
 
-qt4_add_dbus_adaptor( libakonadiprivate_SRCS interfaces/org.kde.Akonadi.Server.xml akonadi.h Akonadi::AkonadiServer )
+qt4_add_dbus_adaptor( libakonadiprivate_SRCS interfaces/org.freedesktop.Akonadi.Server.xml akonadi.h Akonadi::AkonadiServer )
 
-qt4_add_dbus_interfaces( libakonadiprivate_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/org.kde.Akonadi.AgentManager.xml ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/org.kde.Akonadi.Resource.xml )
-qt4_add_dbus_interface( libakonadiprivate_SRCS interfaces/org.kde.Akonadi.Search.xml searchinterface )
-qt4_add_dbus_interface( libakonadiprivate_SRCS interfaces/org.kde.Akonadi.SearchQuery.xml searchqueryinterface )
-qt4_add_dbus_interface( libakonadiprivate_SRCS interfaces/org.kde.Akonadi.SearchQueryIterator.xml searchqueryiteratorinterface )
+qt4_add_dbus_interfaces( libakonadiprivate_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/org.freedesktop.Akonadi.AgentManager.xml ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/org.freedesktop.Akonadi.Resource.xml )
+qt4_add_dbus_interface( libakonadiprivate_SRCS interfaces/org.freedesktop.Akonadi.Search.xml searchinterface )
+qt4_add_dbus_interface( libakonadiprivate_SRCS interfaces/org.freedesktop.Akonadi.SearchQuery.xml searchqueryinterface )
+qt4_add_dbus_interface( libakonadiprivate_SRCS interfaces/org.freedesktop.Akonadi.SearchQueryIterator.xml searchqueryiteratorinterface )
 
 set(xesam_xml  interfaces/org.freedesktop.xesam.Search.xml)
 
-SET_SOURCE_FILES_PROPERTIES(${xesam_xml} PROPERTIES INCLUDE "xesamtypes.h")
+set_source_files_properties(${xesam_xml} PROPERTIES INCLUDE "xesamtypes.h")
 
 qt4_add_dbus_interface( libakonadiprivate_SRCS ${xesam_xml} xesaminterface )
 
 qt4_add_resources( libakonadiprivate_SRCS src/storage/akonadidb.qrc )
 
 
-kde4_add_library( akonadiprivate SHARED ${libakonadiprivate_SRCS} )
+add_library( akonadiprivate SHARED ${libakonadiprivate_SRCS} )
 target_link_libraries( akonadiprivate
   ${QT_QTCORE_LIBRARY}
   ${QT_QTNETWORK_LIBRARY}
@@ -133,17 +130,18 @@ target_link_libraries( akonadiprivate
   ${QT_QTXML_LIBRARY}
   akonadiprotocolinternals
 )
-if(WIN32)
-  target_link_libraries( akonadiprivate ${KDEWIN32_LIBRARIES} )
-endif(WIN32)
 
-set_target_properties( akonadiprivate PROPERTIES VERSION "0.80.0" SOVERSION "0" )
+set_target_properties( akonadiprivate PROPERTIES
+                        VERSION ${AKONADI_LIB_VERSION_STRING}
+                        SOVERSION ${AKONADI_LIB_MAJOR_VERSION}
+                        DEFINE_SYMBOL MAKE_AKONADIPRIVATE_LIB
+                      )
 install( TARGETS akonadiprivate DESTINATION ${LIB_INSTALL_DIR} )
 
 set( akonadiserver_bin_SRCS src/main.cpp control/kcrash.cpp )
 
 
-kde4_add_executable( akonadiserver_bin NOGUI ${akonadiserver_bin_SRCS} )
+add_executable( akonadiserver_bin ${akonadiserver_bin_SRCS} )
 set_target_properties( akonadiserver_bin PROPERTIES OUTPUT_NAME akonadiserver )
 target_link_libraries( akonadiserver_bin akonadiprivate )
 
@@ -153,11 +151,11 @@ install( FILES src/storage/mysql-global.
 ## DBus XML files
 
 install( FILES
-   interfaces/org.kde.Akonadi.Search.xml
-   interfaces/org.kde.Akonadi.ControlManager.xml
-   interfaces/org.kde.Akonadi.Server.xml
-   interfaces/org.kde.Akonadi.SearchQueryIterator.xml
-   interfaces/org.kde.Akonadi.TracerNotification.xml
-   interfaces/org.kde.Akonadi.SearchQuery.xml
+   interfaces/org.freedesktop.Akonadi.Search.xml
+   interfaces/org.freedesktop.Akonadi.ControlManager.xml
+   interfaces/org.freedesktop.Akonadi.Server.xml
+   interfaces/org.freedesktop.Akonadi.SearchQueryIterator.xml
+   interfaces/org.freedesktop.Akonadi.TracerNotification.xml
+   interfaces/org.freedesktop.Akonadi.SearchQuery.xml
 DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
 
--- libs/imapparser.cpp	
+++ libs/imapparser.cpp	
@@ -386,6 +386,25 @@ int ImapParser::parseDateTime(const QByt
   return pos;
 }
 
+void ImapParser::splitVersionedKey( const QByteArray &data, QByteArray &key, int &version )
+{
+  if ( data.contains( '[' ) && data.contains( ']' ) ) {
+    int startPos = data.indexOf( '[' );
+    int endPos = data.indexOf( ']' );
+    if ( startPos != -1 && endPos != -1 && endPos > startPos ) {
+      bool ok = false;
+
+      version = data.mid( startPos + 1, endPos - startPos - 1 ).toInt( &ok );
+      if ( !ok )
+        version = 0;
+
+      key = data.left( startPos );
+    }
+  } else {
+    key = data;
+    version = 0;
+  }
+}
 
 ImapParser::ImapParser() :
     d ( new Private )
--- libs/protocol_p.h	
+++ libs/protocol_p.h	
@@ -29,8 +29,8 @@
 */
 
 // D-Bus service names
-#define AKONADI_DBUS_SERVER_SERVICE "org.kde.Akonadi"
-#define AKONADI_DBUS_CONTROL_SERVICE "org.kde.Akonadi.Control"
+#define AKONADI_DBUS_SERVER_SERVICE "org.freedesktop.Akonadi"
+#define AKONADI_DBUS_CONTROL_SERVICE "org.freedesktop.Akonadi.Control"
 
 // Commands
 #define AKONADI_CMD_ITEMFETCH "FETCH"
--- libs/imapparser_p.h	
+++ libs/imapparser_p.h	
@@ -137,6 +137,13 @@ class AKONADIPROTOCOLINTERNALS_EXPORT Im
     */
     static int parseDateTime( const QByteArray &data, QDateTime &dateTime, int start = 0 );
 
+    /**
+      Split a versioned key of the form 'key[version]' into its components.
+      @param data The versioned key.
+      @param key The unversioned key.
+      @param version The version of the key or 0 if no version was set.
+     */
+    static void splitVersionedKey( const QByteArray &data, QByteArray &key, int &version );
 
     /**
       Constructs a new IMAP parser.
--- libs/CMakeLists.txt	
+++ libs/CMakeLists.txt	
@@ -1,4 +1,4 @@
-set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII ${KDE4_ENABLE_EXCEPTIONS}" )
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII ${_ENABLE_EXCEPTIONS}" )
 
 include_directories(
    ${CMAKE_BINARY_DIR}/akonadi
@@ -13,10 +13,15 @@ set( akonadiprotocolinternals_srcs
   xdgbasedirs.cpp
 )
 
-kde4_add_library( akonadiprotocolinternals SHARED ${akonadiprotocolinternals_srcs} )
+add_library( akonadiprotocolinternals SHARED ${akonadiprotocolinternals_srcs} )
 
 target_link_libraries( akonadiprotocolinternals ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY})
-set_target_properties( akonadiprotocolinternals PROPERTIES VERSION "0.80.0" SOVERSION "0" )
+set_target_properties( akonadiprotocolinternals PROPERTIES
+                        VERSION ${AKONADI_LIB_VERSION_STRING}
+                        SOVERSION ${AKONADI_LIB_MAJOR_VERSION}
+                        DEFINE_SYMBOL MAKE_AKONADIPROTOCOLINTERNALS_LIB
+                      )
+
 install( TARGETS akonadiprotocolinternals ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 install( FILES
@@ -26,7 +31,7 @@ install( FILES
   notificationmessage_p.h
   protocol_p.h
   xdgbasedirs_p.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/akonadi/private
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/akonadi/private
 )
 
 
--- CMakeLists.txt	
+++ CMakeLists.txt	
@@ -1,76 +1,120 @@
 project(akonadi)
 
+cmake_minimum_required(VERSION 2.4.5 FATAL_ERROR)
+
+# enable unit tests
+enable_testing()
+
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
+######## find packages ####################
+
+include(MacroLogFeature)
+
+set(QT_MIN_VERSION 4.4.0)
 find_package(Qt4 REQUIRED)
+if (NOT QT_QTDBUS_FOUND)
+   message(FATAL_ERROR  "Akonadi requires Qt4 with QtDBus module in order to built.")
+endif(NOT QT_QTDBUS_FOUND)
 
-include(AkonadiInternal)
+find_package(Automoc4 REQUIRED)
+
+set(SHARED_MIME_INFO_MINIMUM_VERSION "0.20")
+find_package(SharedMimeInfo REQUIRED)
+
+find_package(LibXslt)
+macro_log_feature(XSLTPROC_EXECUTABLE "xsltproc" "xsltproc" "http://xmlsoft.org/XSLT/" FALSE "" "Needed to generate Akonadi database code")
+
+# this one actually sets only install locations
+include(InstallSettings)
+
+################ configure checks and similar things ##############################
+
+set(AKONADI_LIB_MAJOR_VERSION "0")
+set(AKONADI_LIB_MINOR_VERSION "80")
+set(AKONADI_LIB_PATCH_VERSION "0")
+set(AKONADI_LIB_VERSION_STRING "${AKONADI_LIB_MAJOR_VERSION}.${AKONADI_LIB_MINOR_VERSION}.${AKONADI_LIB_PATCH_VERSION}")
+
+
+# set the output paths
+set (EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
+if (WIN32)
+   set(LIBRARY_OUTPUT_PATH            ${EXECUTABLE_OUTPUT_PATH} )
+else (WIN32)
+   set(LIBRARY_OUTPUT_PATH            ${CMAKE_BINARY_DIR}/lib )
+endif (WIN32)
 
-add_subdirectory(cmake)
 
 configure_file(akonadi-prefix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/akonadi-prefix.h)
 
-INCLUDE(CheckIncludeFiles)
+include(CheckIncludeFiles)
 check_include_files(execinfo.h HAVE_EXECINFO_H)
 check_include_files(unistd.h HAVE_UNISTD_H)
 configure_file(config-akonadi.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-akonadi.h)
 
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/akonadi ${QT_INCLUDES})
 
-# we need the absolute directories where stuff will be installed too
-# but since the variables which contain the destinations can be relative
-# or absolute paths, we need this macro to make them all absoulte, Alex
-macro(MAKE_INSTALL_PATH_ABSOLUTE out in)
-   if (UNIX)
-      if ("${in}" MATCHES "^/.*")
-         set(${out} "${in}")
-      else ("${in}" MATCHES "^/.*")
-         set(${out} "\${KDE4_INSTALL_DIR}/${in}")
-      endif ("${in}" MATCHES "^/.*")
-   else (UNIX)
-      if ("${in}" MATCHES "^[a-zA-Z]:.*")
-        set(${out} "${in}")
-      else ("${in}" MATCHES "^[a-zA-Z]:.*")
-         set(${out} "\${KDE4_INSTALL_DIR}/${in}")
-      endif ("${in}" MATCHES "^[a-zA-Z]:.*")
-   endif (UNIX)
-endmacro(MAKE_INSTALL_PATH_ABSOLUTE out in)
+if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER MATCHES "icc")
+   set (_ENABLE_EXCEPTIONS -fexceptions)
+   set ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+   set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common")
+else (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER MATCHES "icc")
+   if (MSVC)
+      set (_ENABLE_EXCEPTIONS -EHsc)
+   endif (MSVC)
+endif (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER MATCHES "icc")
+
 
-make_install_path_absolute(AKONADI_DBUS_INTERFACES_DIR ${DBUS_INTERFACES_INSTALL_DIR})
-make_install_path_absolute(AKONADI_DBUS_SERVICES_DIR   ${DBUS_SERVICES_INSTALL_DIR})
+################# build targets ########################
 
-set(AKONADI_DBUS_INTERFACES_DIR \"${AKONADI_DBUS_INTERFACES_DIR}\")
-set(AKONADI_DBUS_SERVICES_DIR   \"${AKONADI_DBUS_SERVICES_DIR}\")
+#add_subdirectory(cmake)
+
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/akonadi ${QT_INCLUDES})
+
+# if something breaks because the block below is commented out, 
+# please send me an email, Alex <neundorf@kde.org>
+
+# # we need the absolute directories where stuff will be installed too
+# # but since the variables which contain the destinations can be relative
+# # or absolute paths, we need this macro to make them all absoulte, Alex
+# macro(MAKE_INSTALL_PATH_ABSOLUTE out in)
+#    if (UNIX)
+#       if ("${in}" MATCHES "^/.*")
+#          set(${out} "${in}")
+#       else ("${in}" MATCHES "^/.*")
+#          set(${out} "\${KDE4_INSTALL_DIR}/${in}")
+#       endif ("${in}" MATCHES "^/.*")
+#    else (UNIX)
+#       if ("${in}" MATCHES "^[a-zA-Z]:.*")
+#          set(${out} "${in}")
+#       else ("${in}" MATCHES "^[a-zA-Z]:.*")
+#          set(${out} "\${KDE4_INSTALL_DIR}/${in}")
+#       endif ("${in}" MATCHES "^[a-zA-Z]:.*")
+#    endif (UNIX)
+# endmacro(MAKE_INSTALL_PATH_ABSOLUTE out in)
+# 
+# make_install_path_absolute(AKONADI_DBUS_INTERFACES_DIR ${DBUS_INTERFACES_INSTALL_DIR})
+# make_install_path_absolute(AKONADI_DBUS_SERVICES_DIR   ${DBUS_SERVICES_INSTALL_DIR})
+# 
+# set(AKONADI_DBUS_INTERFACES_DIR \"${AKONADI_DBUS_INTERFACES_DIR}\")
+# set(AKONADI_DBUS_SERVICES_DIR   \"${AKONADI_DBUS_SERVICES_DIR}\")
 
 add_subdirectory(interfaces)
 add_subdirectory(libs)
 
-find_package(LibXslt)
-macro_log_feature(XSLTPROC_EXECUTABLE "xsltproc" "xsltproc" "http://xmlsoft.org/XSLT/" FALSE "" "Needed to generate Akonadi database code")
-
 if (XSLTPROC_EXECUTABLE)
-   #generates a D-Bus interface description from a KConfigXT file
-   macro( kcfg_generate_dbus_interface _kcfg _name )
-      add_custom_command(
-         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_name}.xml
-         COMMAND ${XSLTPROC_EXECUTABLE} --stringparam interfaceName ${_name}
-         ${CMAKE_INSTALL_PREFIX}/share/apps/akonadi-kde/kcfg2dbus.xsl
-         ${_kcfg}
-         > ${CMAKE_CURRENT_BINARY_DIR}/${_name}.xml
-         DEPENDS ${CMAKE_INSTALL_PREFIX}/share/apps/akonadi-kde/kcfg2dbus.xsl
-         ${_kcfg}
-         )
-   endmacro( kcfg_generate_dbus_interface )
    add_subdirectory(server)
 endif (XSLTPROC_EXECUTABLE)
 
-#### MIME type spezializations
-
-set(SHARED_MIME_INFO_MINIMUM_VERSION "0.20")
-find_package(SharedMimeInfo REQUIRED)
-
-########### next target ###############
+############# install stuff ######################
 
 install(FILES akonadi-mime.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
 update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
+
+if(NOT WIN32)   # pkgconfig file
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/akonadi.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/akonadi.pc @ONLY)
+   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/akonadi.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
+endif(NOT WIN32)
+
+
+macro_display_feature_log()
--- README	
+++ README	
@@ -0,0 +1,36 @@
+Akonadi
+========
+
+What is Akonadi?
+------------------
+Akonadi is a PIM layer, which provides an asynchronous API to access all kind
+of PIM data (e.g. mails, contacts, events, todos etc.).
+
+It consists of several processes (generally called the Akonadi server) and a
+library (called client library) which encapsulates the communication
+between the client and the server.
+
+This directory contains the sources of the Akonadi server and all the infrastructure
+that is needed to build the client libraries and the application which want to make
+use of Akonadi.
+
+Struture
+----------
+
+  * cmake/
+      Contains the cmake checks that are needed to build the server.
+
+  * interfaces/
+      Contains the dbus interface descriptions that are used by the
+      client library to control the Akonadi server or request status
+      information.
+
+  * libs/
+      Contains the sources of a private library which provides utils
+      that are used by both, the Akonadi server and the client library.
+
+  * server/
+
+
+
+See INSTALL for installation instructions.

Places

File akonadi-804508.diff of Package akonadi-runtime (Revision 19dbd3833df3428bd9f65cc8dee2c1ce)

Places