Commit 3f07f5ea authored by Laurent Montel's avatar Laurent Montel 😁

Build++

parent 314db1ed
......@@ -28,6 +28,8 @@ set(KDEPIM_LIB_VERSION "5.43.0")
set(QT_REQUIRED_VERSION "5.4.0")
set(KCALENDARCORE_LIB_VERSION "4.81.0")
set(AKONADICALENDAR_LIB_VERSION "4.80.0")
set(KMIME_LIB_VERSION "4.87.0")
set(IDENTITYMANAGEMENT_LIB_VERSION "4.80.0")
find_package(KF5Akonadi ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test UiTools)
......@@ -39,7 +41,8 @@ find_package(KF5CalendarUtils ${CALENDARUTILS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5CalendarCore ${KCALENDARCORE_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5CalendarSupport ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiCalendar ${AKONADICALENDAR_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5IdentityManagement ${IDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED)
ecm_setup_version(${KDEPIM_LIB_VERSION} VARIABLE_PREFIX EVENTVIEWS
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/eventviews_version.h"
......@@ -50,6 +53,10 @@ ecm_setup_version(${KDEPIM_LIB_VERSION} VARIABLE_PREFIX EVENTVIEWS
########### Targets ###########
add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
remove_definitions( -DQT_NO_CAST_FROM_BYTEARRAY )
#remove_definitions( -DQT_NO_CAST_FROM_ASCII )
#remove_definitions( -DQT_NO_CAST_TO_ASCII )
########### CMake Config Files ###########
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5EventViews")
......
......@@ -44,7 +44,7 @@ void WhatsNextTextBrowser::setSource(const QUrl &name)
} else if (uri.startsWith(QStringLiteral("todo:"))) {
Q_EMIT showIncidence(uri);
} else {
QTextBrowser::setSource(uri);
QTextBrowser::setSource(QUrl(uri));
}
}
......
......@@ -37,13 +37,12 @@ find_package(KF5Codecs ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5CalendarSupport ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5EventViews ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Libkdepim ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5KdepimDBusInteraces ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
# KF5::AkonadiCalendar
# KF5::CalendarCore
# KF5::CalendarUtils
# KF5::MailTransport
# KF5::KDGantt2 # For FreeBusy Editor
# kdepimdbusinterfaces # For UriHandler
# KF5::Ldap
# KF5::AkonadiWidgets
......
......@@ -9,7 +9,7 @@ MACRO(IE_UNIT_TESTS)
add_executable( ${_testname} ${_testname}.cpp modeltest.cpp )
add_test( ${_testname} ${_testname} )
ecm_mark_as_test(${_testname})
target_link_libraries(${_testname} Qt5::Test KF5::AkonadiCore KF5::KDGantt2 KF5::CalendarUtils KF5::CalendarCore KF5::IncidenceEditorsng kdepimdbusinterfaces KF5::Libkdepim)
target_link_libraries(${_testname} Qt5::Test KF5::AkonadiCore KF5::KDGantt2 KF5::CalendarUtils KF5::CalendarCore KF5::IncidenceEditorsng KF5::KdepimDBusInterfaces KF5::Libkdepim)
ENDFOREACH(_testname)
ENDMACRO(IE_UNIT_TESTS)
......
......@@ -106,7 +106,7 @@ PUBLIC
KF5::KDGantt2 # For FreeBusy Editor
PRIVATE
KF5::Libkdepim
kdepimdbusinterfaces # For UriHandler
KF5::KdepimDBusInterfaces # For UriHandler
KF5::Codecs
KF5::Ldap
KF5::AkonadiWidgets
......@@ -170,7 +170,7 @@ if (BUILD_TESTING)
KF5::CalendarUtils
KF5::IncidenceEditorsng
KF5::CalendarSupport
kdepimdbusinterfaces
KF5::KdepimDBusInterfaces
)
install(TARGETS kincidenceeditor ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
......
......@@ -23,7 +23,7 @@
#include "attachmenticonview.h"
#include "ui_dialogdesktop.h"
#include <libkdepimdbusinterfaces/src/urihandler.h>
#include <KdepimDBusInterfaces/UriHandler>
#include <KContacts/VCardDrag>
......
......@@ -54,7 +54,7 @@ set_target_properties(kontact_bin PROPERTIES OUTPUT_NAME kontact)
target_link_libraries(kontact_bin
KF5::WebKit
KF5::Service
kdepimdbusinterfaces
KF5::KdepimDBusInterfaces
kontactprivate
)
......
......@@ -27,7 +27,7 @@
#include "prefs.h"
using namespace Kontact;
#include <libkdepimdbusinterfaces/src/reminderclient.h>
#include <KdepimDBusInterfaces/ReminderClient>
#include <KontactInterface/Plugin>
#include <KontactInterface/UniqueAppHandler>
......
......@@ -23,7 +23,7 @@ target_link_libraries(testalarmdlg
KF5::AkonadiMime
KF5::CalendarSupport
KF5::IncidenceEditorsng
kdepimdbusinterfaces
KF5::KdepimDBusInterfaces
KF5::KIOCore
KF5::Mime
korganizer_core
......
......@@ -47,7 +47,7 @@ target_link_libraries(korganizer
KF5::KontactInterface
KF5::CalendarCore
KF5::Libkdepim
kdepimdbusinterfaces
KF5::KdepimDBusInterfaces
korganizerprivate
korganizer_interfaces
korganizer_core
......@@ -242,7 +242,7 @@ PRIVATE
KF5::EventViews
KF5::IncidenceEditorsng
KF5::Libkdepim
kdepimdbusinterfaces
KF5::KdepimDBusInterfaces
korganizer_core
korganizer_interfaces
KF5::AkonadiCore
......
......@@ -41,7 +41,7 @@
#include "prefs/koprefs.h"
#include "koviewmanager.h"
#include "kowindowlist.h"
#include "libkdepimdbusinterfaces/src/reminderclient.h"
#include "KdepimDBusInterfaces/ReminderClient"
#include "kocheckableproxymodel.h"
#include <KHolidays/HolidayRegion>
......
......@@ -28,7 +28,7 @@
#include "actionmanager.h"
#include "calendarview.h"
#include "korganizer.h"
#include "libkdepimdbusinterfaces/src/reminderclient.h"
#include "KdepimDBusInterfaces/ReminderClient"
#include "kdepim-version.h"
#include <KCalCore/CalFormat>
#include <KStartupInfo>
......
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