Commit 6f68293a authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix compile against qt6

parent f78406b4
Pipeline #177855 failed with stage
in 3 minutes and 16 seconds
......@@ -20,7 +20,6 @@
#include <Akonadi/Collection>
#include <Akonadi/CollectionColorAttribute>
#include <Akonadi/CollectionDeleteJob>
#include <Akonadi/CollectionFilterProxyModel>
#include <Akonadi/CollectionIdentificationAttribute>
#include <Akonadi/CollectionModifyJob>
#include <Akonadi/CollectionPropertiesDialog>
......@@ -36,10 +35,8 @@
#include <akonadi_version.h>
#if AKONADICALENDAR_VERSION > QT_VERSION_CHECK(5, 19, 41)
#include <Akonadi/History>
#include <Akonadi/IncidenceChanger>
#else
#include <Akonadi/Calendar/History>
#include <Akonadi/Calendar/IncidenceChanger>
#endif
#include <CalendarSupport/KCalPrefs>
#include <CalendarSupport/Utils>
......
......@@ -9,9 +9,13 @@
#include <akonadi-calendar_version.h>
#if AKONADICALENDAR_VERSION > QT_VERSION_CHECK(5, 19, 41)
#include <Akonadi/ETMCalendar>
#include <Akonadi/IncidenceChanger>
#else
#include <Akonadi/Calendar/ETMCalendar>
#include <Akonadi/Calendar/IncidenceChanger>
#endif
#include <Akonadi/CollectionFilterProxyModel>
#include <KConfigWatcher>
#include <QObject>
#include <akonadi-calendar_version.h>
......@@ -19,10 +23,8 @@
namespace Akonadi
{
class CollectionFilterProxyModel;
class ETMViewStateSaver;
class EntityRightsFilterModel;
class IncidenceChanger;
}
class KDescendantsProxyModel;
......
......@@ -33,7 +33,6 @@
#endif
#include "contactcollectionmodel.h"
#include "globalcontactmodel.h"
#include <Akonadi/CollectionFilterProxyModel>
#include <Akonadi/EntityMimeTypeFilterModel>
#include <Akonadi/EntityRightsFilterModel>
#include <KCheckableProxyModel>
......@@ -45,7 +44,6 @@
#include <KSharedConfig>
#include <QBuffer>
#include <QItemSelectionModel>
#include <QSortFilterProxyModel>
#include <colorproxymodel.h>
namespace
......
......@@ -3,13 +3,14 @@
#pragma once
#include <Akonadi/CollectionFilterProxyModel>
#include <Akonadi/Item>
#include <KDescendantsProxyModel>
#include <QObject>
#include <QSortFilterProxyModel>
namespace Akonadi
{
class CollectionFilterProxyModel;
class EntityRightsFilterModel;
class ETMViewStateSaver;
class EntityMimeTypeFilterModel;
......@@ -17,7 +18,6 @@ class EntityMimeTypeFilterModel;
class KCheckableProxyModel;
class QAbstractItemModel;
class QItemSelectionModel;
class QSortFilterProxyModel;
class ColorProxyModel;
class ContactManager : public QObject
......
......@@ -8,6 +8,7 @@ set(kalendar_lib_SRCS
add_library(kalendar_lib STATIC)
target_sources(kalendar_lib PRIVATE ${kalendar_lib_SRCS})
set_property(TARGET kalendar_lib PROPERTY POSITION_INDEPENDENT_CODE ON)
target_include_directories(kalendar_lib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(kalendar_lib PUBLIC
......
Supports Markdown
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