Commit f3a36f4a authored by Volker Krause's avatar Volker Krause
Browse files

SVN_MERGE

Merged revisions 1017696,1017704,1017761,1017778,1017833,1017835,1017851-1017853,1017919,1017922 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

........
  r1017696 | lueck | 2009-08-31 11:07:27 +0200 (Mon, 31 Aug 2009) | 2 lines
  
  fixed some broken/dead links reported by James Spahlinger, thanks
  BUG:205755
........
  r1017704 | scripty | 2009-08-31 11:18:49 +0200 (Mon, 31 Aug 2009) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r1017761 | thiago | 2009-08-31 13:48:03 +0200 (Mon, 31 Aug 2009) | 1 line
  
  Don't crash if currentItem is 0
........
  r1017778 | tokoe | 2009-08-31 15:12:50 +0200 (Mon, 31 Aug 2009) | 2 lines
  
  Move akonadi-contact library from kdepim/akonadi to kdepimlibs/akonadi
........
  r1017833 | vkrause | 2009-08-31 18:34:08 +0200 (Mon, 31 Aug 2009) | 10 lines
  
  - add a generic unit test for Kolab <-> VCard conversion, a similar one
    for iCal still has to be done but should be straighforward
  - add two test cases for that, the complex one currently fails showing
    various issues, including a messed up display name in the VCard created
    by KAddressbook already as well as lost picture attachments during the
    Kolab conversion
  - use the already existing shared pointer typedefs
  - pass shared pointers as const references
  - some const correctness
........
  r1017835 | cgiboudeaux | 2009-08-31 18:39:54 +0200 (Mon, 31 Aug 2009) | 1 line
  
  the contact subdir no longer exists.
........
  r1017851 | winterz | 2009-08-31 19:38:51 +0200 (Mon, 31 Aug 2009) | 3 lines
  
  fix start date/time and end date/time validator for allday events
  MERGE: none
........
  r1017852 | winterz | 2009-08-31 19:43:45 +0200 (Mon, 31 Aug 2009) | 3 lines
  
  consider the changeIncidence() return value when determining if processInput() succeeded.
  MERGE: none
........
  r1017853 | winterz | 2009-08-31 19:48:18 +0200 (Mon, 31 Aug 2009) | 5 lines
  
  follow the new IncidenceFormatter methods that put the Calendar name in
  the tooltip and displayView
  MERGE: e35,e4
  DO_NOT_BACKPORT: new feature
........
  r1017919 | mkoller | 2009-08-31 23:43:17 +0200 (Mon, 31 Aug 2009) | 4 lines
  
  BUG: 205448
  
  find a better compromise between search speed and responseness of the ui (empirical result)
........
  r1017922 | mkoller | 2009-08-31 23:48:04 +0200 (Mon, 31 Aug 2009) | 5 lines
  
  BUG: 196053
  
  Fix crash in precommand execution (hopefully).
  The crash was probably due to the eventloop object got destroyed in its own loop.
........

svn path=/branches/work/akonadi-ports/kdepim/; revision=1018090
parents 67cd4828 bd252453
......@@ -2,7 +2,6 @@ project(kaddressbook)
include_directories(
${CMAKE_SOURCE_DIR}/akonadi
${CMAKE_SOURCE_DIR}/akonadi/akonadi_next
${CMAKE_SOURCE_DIR}/akonadi/contact
${CMAKE_SOURCE_DIR}/libkdepim
${CMAKE_CURRENT_SOURCE_DIR}/xxport/shared
${QT_QTDBUS_INCLUDE_DIR}
......
......@@ -32,6 +32,10 @@
#include <akonadi/collectionfilterproxymodel.h>
#include <akonadi/collectionmodel.h>
#include <akonadi/contact/contacteditordialog.h>
#include <akonadi/contact/contactgroupeditordialog.h>
#include <akonadi/contact/contactgroupviewer.h>
#include <akonadi/contact/contactviewer.h>
#include <akonadi/control.h>
#include <akonadi/entityfilterproxymodel.h>
#include <akonadi/itemview.h>
......@@ -53,10 +57,6 @@
#include <ktoolbar.h>
#include <kxmlguiwindow.h>
#include "akonadi/contact/contacteditordialog.h"
#include "akonadi/contact/contactgroupeditordialog.h"
#include "akonadi/contact/contactgroupviewer.h"
#include "akonadi/contact/contactviewer.h"
#include "akonadi_next/entitytreeview.h"
#include "contactfiltermodel.h"
#include "contactstreemodel.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment