now akonadi-calendar/akonadi-contact compile fine

akonadi-contact/CMakeLists.txt

@@ -27,12 +27,13 @@ ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX AKONADICONTACT
 ########### Find packages ###########
 find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
-find_package(KF5Abc ${KF5_VERSION} CONFIG REQUIRED)
-find_package(KF5CalendarCore ${KF5_VERSION} CONFIG REQUIRED)
-
+find_package(KF5Completion ${KF5_VERSION} CONFIG REQUIRED)
+#find_package(Phonon4Qt5 CONFIG REQUIRED)
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${Akonadi-Contact_SOURCE_DIR})
   find_package(KF5Akonadi CONFIG REQUIRED)
+  find_package(KF5Abc ${KF5_VERSION} CONFIG REQUIRED)
+  find_package(KF5CalendarCore ${KF5_VERSION} CONFIG REQUIRED)
 endif()
 
 ########### Targets ###########

akonadi-contact/src/CMakeLists.txt

@@ -4,11 +4,11 @@ kde_enable_exceptions()
 remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
 remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII)
 
-find_package(Prison QUIET)
-set_package_properties(Prison PROPERTIES DESCRIPTION "Prison" URL "http://projects.kde.org/prison" TYPE OPTIONAL PURPOSE "Needed to show mobile barcodes of your contacts")
+#REACTIVATE
+#find_package(Prison QUIET)
+#set_package_properties(Prison PROPERTIES DESCRIPTION "Prison" URL "http://projects.kde.org/prison" TYPE OPTIONAL PURPOSE "Needed to show mobile barcodes of your contacts")
 if (PRISON_FOUND)
     add_definitions(-DHAVE_PRISON)
-    include_directories(${PRISON_INCLUDE_DIR})
 endif()
 
 set( AKONADI_PHONE_DIAL_DEFAULT "UseSkype" )
@@ -123,36 +123,39 @@ generate_export_header(KF5AkonadiContact BASE_NAME akonadi-contact)
 add_library(KF5::AkonadiContact ALIAS KF5AkonadiContact)
 
 target_include_directories(KF5AkonadiContact INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/AkonadiContact;${Boost_INCLUDE_DIR}>")
+target_include_directories(KF5AkonadiContact PUBLIC "$<BUILD_INTERFACE:${Akonadi-Contact_SOURCE_DIR}/src;${Akonadi-Contact_BINARY_DIR}/src;${Boost_INCLUDE_DIR}>")
 
 target_link_libraries(KF5AkonadiContact
+    KF5::KDELibs4Support
     KF5::AkonadiCore
     KF5::AkonadiWidgets
     KF5::KIOCore
-    KF5::KDELibs4Support
     KF5::KMime
     KF5::CalendarCore
     KF5::PimUtils
-    
+    KF5::Completion    
     KF5::Abc
+    #Phonon::phonon4qt5
 )
 
 
-if (KDE4_BUILD_TESTS)
-   set(AKONADI_CONTACT_TESTS_EXPORT AKONADI_CONTACT_EXPORT)
-endif()
+#REACTIVE
+#if (KDE4_BUILD_TESTS)
+#   set(AKONADI_CONTACT_TESTS_EXPORT AKONADI_CONTACT_EXPORT)
+#endif()
 configure_file(akonadi-contactprivate_export.h.in "${CMAKE_CURRENT_BINARY_DIR}/akonadi-contactprivate_export.h")
 
 
-
-if (KDE4_BUILD_TESTS)
-   set(AKONADI_CONTACT_TESTS_EXPORT AKONADI_CONTACT_EXPORT)
-endif()
+#REACTIVATE
+#if (KDE4_BUILD_TESTS)
+#   set(AKONADI_CONTACT_TESTS_EXPORT AKONADI_CONTACT_EXPORT)
+#endif()
 configure_file(akonadi-contactprivate_export.h.in
   "${CMAKE_CURRENT_BINARY_DIR}/akonadi-contactprivate_export.h"
 )
 
 if(PRISON_FOUND) 
-target_link_libraries(KF5AkonadiContact ${PRISON_LIBRARIES})
+#target_link_libraries(KF5AkonadiContact ${PRISON_LIBRARIES})
 endif()
 
 set_target_properties(KF5AkonadiContact PROPERTIES
@@ -239,3 +242,4 @@ install( FILES
   editor/im/improtocols.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/akonadi/contact COMPONENT Devel
 )
+

akonadi-contact/src/abstractcontactformatter.cpp

@@ -21,7 +21,7 @@
 
 #include "abstractcontactformatter.h"
 
-#include <AkonadiCore/item.h>
+#include <item.h>
 #include <kabc/addressee.h>
 
 using namespace Akonadi;

akonadi-contact/src/abstractcontactgroupformatter.cpp

@@ -21,7 +21,7 @@
 
 #include "abstractcontactgroupformatter.h"
 
-#include <AkonadiCore/item.h>
+#include <item.h>
 #include <kabc/contactgroup.h>
 
 using namespace Akonadi;

akonadi-contact/src/attributeregistrar.cpp

@@ -21,7 +21,7 @@
 
 #include "contactmetadataattribute_p.h"
 
-#include <AkonadiCore/attributefactory.h>
+#include <attributefactory.h>
 
 namespace {
 

akonadi-contact/src/collectionfiltermodel.cpp

@@ -21,7 +21,7 @@
 
 #include "collectionfiltermodel_p.h"
 
-#include <AkonadiCore/entitytreemodel.h>
+#include <entitytreemodel.h>
 
 CollectionFilterModel::CollectionFilterModel( QObject *parent )
   : QSortFilterProxyModel( parent ), mRights( Akonadi::Collection::ReadOnly )

akonadi-contact/src/collectionfiltermodel_p.h

@@ -24,7 +24,7 @@
 
 #include <QSortFilterProxyModel>
 
-#include <AkonadiCore/collection.h>
+#include <collection.h>
 
 /**
  * @short A filter model for Akonadi collections.

akonadi-contact/src/contactcompletionmodel.cpp

@@ -21,10 +21,10 @@
 
 #include "contactcompletionmodel_p.h"
 
-#include <AkonadiCore/changerecorder.h>
-#include <AkonadiCore/entitymimetypefiltermodel.h>
-#include <AkonadiCore/itemfetchscope.h>
-#include <AkonadiCore/session.h>
+#include <changerecorder.h>
+#include <entitymimetypefiltermodel.h>
+#include <itemfetchscope.h>
+#include <session.h>
 
 #include <kabc/addressee.h>
 

akonadi-contact/src/contactcompletionmodel_p.h

@@ -22,7 +22,7 @@
 #ifndef AKONADI_CONTACTCOMPLETIONMODEL_P_H
 #define AKONADI_CONTACTCOMPLETIONMODEL_P_H
 
-#include <AkonadiCore/entitytreemodel.h>
+#include <entitytreemodel.h>
 
 namespace Akonadi {
 

akonadi-contact/src/contacteditor.cpp

@@ -27,14 +27,14 @@
 #include "contactmetadataattribute_p.h"
 #include "editor/contacteditorwidget.h"
 
-#include <AkonadiWidgets/collectiondialog.h>
-#include <AkonadiCore/collectionfetchjob.h>
-#include <AkonadiCore/itemcreatejob.h>
-#include <AkonadiCore/itemfetchjob.h>
-#include <AkonadiCore/itemfetchscope.h>
-#include <AkonadiCore/itemmodifyjob.h>
-#include <AkonadiCore/monitor.h>
-#include <AkonadiCore/session.h>
+#include <collectiondialog.h>
+#include <collectionfetchjob.h>
+#include <itemcreatejob.h>
+#include <itemfetchjob.h>
+#include <itemfetchscope.h>
+#include <itemmodifyjob.h>
+#include <monitor.h>
+#include <session.h>
 #include <kabc/addressee.h>
 #include <klocalizedstring.h>
 

akonadi-contact/src/contacteditordialog.cpp

@@ -23,8 +23,8 @@
 
 #include "contacteditor.h"
 
-#include <AkonadiWidgets/collectioncombobox.h>
-#include <AkonadiCore/item.h>
+#include <collectioncombobox.h>
+#include <item.h>
 
 #include <kabc/addressee.h>
 

akonadi-contact/src/contactgroupeditor.cpp

@@ -27,14 +27,14 @@
 #include "contactgroupeditordelegate_p.h"
 #include "waitingoverlay_p.h"
 
-#include <AkonadiCore/collectiondialog.h>
-#include <AkonadiCore/collectionfetchjob.h>
-#include <AkonadiCore/itemcreatejob.h>
-#include <AkonadiCore/itemfetchjob.h>
-#include <AkonadiCore/itemfetchscope.h>
-#include <AkonadiCore/itemmodifyjob.h>
-#include <akonadi/monitor.h>
-#include <AkonadiCore/session.h>
+#include <collectiondialog.h>
+#include <collectionfetchjob.h>
+#include <itemcreatejob.h>
+#include <itemfetchjob.h>
+#include <itemfetchscope.h>
+#include <itemmodifyjob.h>
+#include <monitor.h>
+#include <session.h>
 #include <kabc/contactgroup.h>
 #include <klocalizedstring.h>
 #include <klineedit.h>

akonadi-contact/src/contactgroupeditor_p.h

@@ -26,8 +26,8 @@
 
 #include "ui_contactgroupeditor.h"
 
-#include <AkonadiCore/collection.h>
-#include <AkonadiCore/item.h>
+#include <collection.h>
+#include <item.h>
 
 class KJob;
 

akonadi-contact/src/contactgroupeditordelegate.cpp

@@ -24,7 +24,7 @@
 #include "contactcompletionmodel_p.h"
 #include "contactgroupmodel_p.h"
 
-#include <AkonadiCore/entitytreemodel.h>
+#include <entitytreemodel.h>
 #include <kcombobox.h>
 #include <kicon.h>
 #include <klocalizedstring.h>

akonadi-contact/src/contactgroupeditordelegate_p.h

@@ -26,7 +26,7 @@
 
 #include <QStyledItemDelegate>
 
-#include <AkonadiCore/item.h>
+#include <item.h>
 
 namespace Akonadi
 {

akonadi-contact/src/contactgroupeditordialog.cpp

@@ -24,8 +24,8 @@
 #include "contactgroupeditor.h"
 #include "contactgroupeditor_p.h"
 
-#include <akonadi/collectioncombobox.h>
-#include <AkonadiCore/item.h>
+#include <collectioncombobox.h>
+#include <item.h>
 #include <kabc/contactgroup.h>
 #include <klocale.h>
 #include <klocalizedstring.h>

akonadi-contact/src/contactgroupexpandjob.cpp

@@ -21,10 +21,10 @@
 
 #include "contactgroupexpandjob.h"
 
-#include <akonadi/contact/contactgroupsearchjob.h>
-#include <AkonadiCore/itemfetchjob.h>
-#include <AkonadiCore/itemfetchscope.h>
-#include <akonadi/itemsearchjob.h>
+#include <contactgroupsearchjob.h>
+#include <itemfetchjob.h>
+#include <itemfetchscope.h>
+#include <itemsearchjob.h>
 
 using namespace Akonadi;
 

akonadi-contact/src/contactgrouplineedit.cpp

@@ -23,9 +23,9 @@
 
 #include "contactcompletionmodel_p.h"
 
-#include <AkonadiCore/entitytreemodel.h>
-#include <AkonadiCore/itemfetchjob.h>
-#include <AkonadiCore/itemfetchscope.h>
+#include <entitytreemodel.h>
+#include <itemfetchjob.h>
+#include <itemfetchscope.h>
 #include <klocalizedstring.h>
 
 #include <QtCore/QAbstractItemModel>

akonadi-contact/src/contactgrouplineedit_p.h

@@ -22,7 +22,7 @@
 #ifndef AKONADI_CONTACTGROUPLINEEDIT_P_H
 #define AKONADI_CONTACTGROUPLINEEDIT_P_H
 
-#include <AkonadiCore/item.h>
+#include <item.h>
 #include <kabc/addressee.h>
 #include <kabc/contactgroup.h>
 #include <klineedit.h>

akonadi-contact/src/contactgroupmodel.cpp

@@ -21,8 +21,8 @@
 
 #include "contactgroupmodel_p.h"
 
-#include <AkonadiCore/itemfetchjob.h>
-#include <AkonadiCore/itemfetchscope.h>
+#include <itemfetchjob.h>
+#include <itemfetchscope.h>
 #include <kabc/addressee.h>
 #include <kicon.h>
 #include <kiconloader.h>
@@ -294,8 +294,13 @@ QVariant ContactGroupModel::data( const QModelIndex &index, int role ) const
     }
 
     if ( member.isReference ) {
+//QT5 port
+#if 0
       return QIcon::fromTheme( QLatin1String( "x-office-contact" ), KIconLoader::global(),
                     QStringList() << QLatin1String( "emblem-symbolic-link" ) );
+#else
+      return QString();
+#endif
     } else {
       return QIcon::fromTheme( QLatin1String( "x-office-contact" ) );
     }