Commit 78609135 authored by Laurent Montel's avatar Laurent Montel 😁

Make it compiles

parent a1567f15
......@@ -87,10 +87,25 @@ option(QTWEBENGINE_SUPPORT_OPTION "Enable support for QtWebEngine. False by defa
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Sql Concurrent UiTools OpenGL)
find_package(Qt5X11Extras NO_MODULE)
find_package(Grantlee5 "5.0" CONFIG REQUIRED)
set(LIBGRAVATAR_VERSION_LIB "5.2.40")
set(LIBMAILIMPORTER_VERSION_LIB "5.2.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.40")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.46")
set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.2.40")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
set(LIBINCIDENCEEDITOR_LIB_VERSION_LIB "5.2.40")
set(CALENDARSUPPORT_LIB_VERSION_LIB "5.2.40")
set(EVENTVIEW_LIB_VERSION_LIB "5.2.40")
set(KDGANTT2_LIB_VERSION_LIB "5.2.40")
set(LIBKSIEVE_LIB_VERSION_LIB "5.2.40")
if (QTWEBENGINE_SUPPORT_OPTION)
set(QT_REQUIRED_MINIMUM_WEBENGINE_VERSION "5.6")
find_package(Qt5 ${QT_REQUIRED_MINIMUM_WEBENGINE_VERSION} CONFIG REQUIRED WebEngine WebEngineWidgets)
find_package(KF5ComposerEditorWebEngine ${KDEPIM_APPS_LIB_VERSION_LIB} CONFIG REQUIRED)
set(WEBENGINE_TYPE "QtWebEngine")
else()
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED WebKitWidgets)
......@@ -145,20 +160,7 @@ find_package(KF5Blog ${KBLOG_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiNotes ${AKONADINOTES_LIB_VERSION} CONFIG REQUIRED)
set(LIBGRAVATAR_VERSION_LIB "5.2.40")
set(LIBMAILIMPORTER_VERSION_LIB "5.2.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.40")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.46")
set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.2.40")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
set(LIBINCIDENCEEDITOR_LIB_VERSION_LIB "5.2.40")
set(CALENDARSUPPORT_LIB_VERSION_LIB "5.2.40")
set(EVENTVIEW_LIB_VERSION_LIB "5.2.40")
set(KDGANTT2_LIB_VERSION_LIB "5.2.40")
set(LIBKSIEVE_LIB_VERSION_LIB "5.2.40")
find_package(KF5Gravatar ${LIBGRAVATAR_VERSION_LIB} CONFIG REQUIRED)
find_package(KF5MailImporter ${LIBMAILIMPORTER_VERSION_LIB} CONFIG REQUIRED)
find_package(KF5MailCommon ${MAILCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
......
......@@ -28,8 +28,6 @@ set(blogilo_SRCS
composer/htmleditor.cpp
composer/stylegetter.cpp
composer/blogilocomposerview.cpp
composer/blogilocomposereditor.cpp
composer/bilbobrowser.cpp
composer/blogilocomposerwidget.cpp
storageservice/storageservicemanagersettingsjob.cpp
......@@ -37,6 +35,20 @@ set(blogilo_SRCS
)
#if (QTWEBENGINE_SUPPORT_OPTION)
# set(blogilo_web_editor
#composer/webengine/blogilocomposerwebengineeditor.cpp
#composer/webengine/blogilocomposerwebengineview.cpp
# )
#else()
set(blogilo_web_editor
composer/webkit/blogilocomposerview.cpp
composer/webkit/blogilocomposereditor.cpp
)
#endif()
if (KF5GAPI_FOUND)
# Blogger API implementation imported from KBlog due to circular deps between
# kdepimlibs and libkgapi
......@@ -63,20 +75,26 @@ qt5_add_resources(blogilo_SRCS blogilo.qrc)
kconfig_add_kcfg_files( blogilo_SRCS settings.kcfgc)
file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/*-apps-blogilo.png")
ecm_add_app_icon(blogilo_SRCS ICONS ${ICONS_SRCS})
add_executable( blogilo ${blogilo_SRCS})
add_executable( blogilo ${blogilo_SRCS} ${blogilo_web_editor})
#if (QTWEBENGINE_SUPPORT_OPTION)
# set(blogilo_webengine_libs Qt5::WebEngine Qt5::WebEngineWidgets KF5::ComposerEditorWebEngine)
#else()
set(blogilo_webengine_libs KF5::WebKit KF5::ComposerEditorNG)
#endif()
target_link_libraries(blogilo
KF5::Blog
KF5::PimCommon
Qt5::Sql
KF5::ComposerEditorNG
KF5::Libkdepim
KF5::TextEditor
KF5::WebKit
KF5::Wallet
KF5::DBusAddons
KF5::XmlGui
KF5::PimTextEdit
${blogilo_webengine_libs}
)
if (KF5GAPI_FOUND)
......
......@@ -19,8 +19,8 @@
*/
#include "blogilocomposerwidget.h"
#include "blogilocomposereditor.h"
#include "blogilocomposerview.h"
#include "webkit/blogilocomposereditor.h"
#include "webkit/blogilocomposerview.h"
#include "PimCommon/CustomToolsWidgetng"
#include <QVBoxLayout>
......
......@@ -32,8 +32,8 @@
#include "bilboblog.h"
#include "syncuploader.h"
#include "composer/blogilocomposereditor.h"
#include "composer/blogilocomposerview.h"
#include "composer/webkit/blogilocomposereditor.h"
#include "composer/webkit/blogilocomposerview.h"
#include "composer/bilbobrowser.h"
#include "composer/htmleditor.h"
#include "composer/blogilocomposerwidget.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