[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/akonadi-ports/kdepimlibs (merge)
From:       Stephen Kelly <steveire () gmail ! com>
Date:       2009-11-25 18:09:00
Message-ID: 1259172540.032485.7779.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1054183 by skelly:

SVN_MERGE

Merged revisions 1054168 via svnmerge from
svn+ssh://skelly@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

........
  r1054168 | skelly | 2009-11-25 18:51:15 +0100 (Wed, 25 Nov 2009) | 1 line

  Build and use the KDescendantsProxyModel in kdepimlibs.
........



 _M            . (directory)  
 M  +1 -0      akonadi/CMakeLists.txt  
 M  +1 -1      akonadi/collectioncombobox.cpp  
 M  +1 -0      akonadi/contact/CMakeLists.txt  
 M  +1 -1      akonadi/contact/contactcompletionmodel.cpp  


--- branches/work/akonadi-ports/kdepimlibs/akonadi/CMakeLists.txt #1054182:1054183
@@ -111,6 +111,7 @@
   itemsync.cpp
   itemview.cpp
   job.cpp
+  kdescendantsproxymodel.cpp
   linkjob.cpp
   mimetypechecker.cpp
   monitor.cpp
--- branches/work/akonadi-ports/kdepimlibs/akonadi/collectioncombobox.cpp #1054182:1054183
@@ -30,7 +30,7 @@
 #include <akonadi/entitytreemodel.h>
 #include <akonadi/session.h>
 
-#include <kdescendantsproxymodel.h>
+#include "kdescendantsproxymodel_p.h"
 
 #include <QtCore/QAbstractItemModel>
 
--- branches/work/akonadi-ports/kdepimlibs/akonadi/contact/CMakeLists.txt #1054182:1054183
@@ -39,6 +39,7 @@
 set(akonadicontact_LIB_SRC
   attributeregistrar.cpp
   collectionfiltermodel.cpp
+  ../kdescendantsproxymodel.cpp
   contactcompletionmodel.cpp
   contactdefaultactions.cpp
   contacteditor.cpp
--- branches/work/akonadi-ports/kdepimlibs/akonadi/contact/contactcompletionmodel.cpp #1054182:1054183
@@ -21,7 +21,7 @@
 
 #include "contactcompletionmodel_p.h"
 
-#include <kdescendantsproxymodel.h>
+#include "../kdescendantsproxymodel_p.h"
 
 #include <akonadi/changerecorder.h>
 #include <akonadi/entitymimetypefiltermodel.h>
[prev in list] [next in list] [prev in thread] [next in thread]