Commit 6d33df2e authored by Laurent Montel's avatar Laurent Montel 😁

Adapt to new api

parent dd7b5ff5
......@@ -136,7 +136,7 @@ else()
set(LIBMAILIMPORTER_VERSION_LIB "5.2.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.40")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.42")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.58")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.59")
set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.2.40")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
......
......@@ -44,7 +44,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${accountwizard_SOURCE_DIR})
option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Xml DBus Test)
set(MAILCOMMON_LIB_VERSION_LIB "5.2.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.58")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.59")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
......
......@@ -42,7 +42,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akonadiconsole_SOURCE_DIR})
set(QT_REQUIRED_VERSION "5.6.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql)
set(LIBMAILIMPORTER_VERSION_LIB "5.2.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.58")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.59")
set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
set(KCALENDARCORE_LIB_VERSION "5.2.40")
......
......@@ -32,7 +32,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akregator_SOURCE_DIR})
find_package(Grantlee5 "5.0" CONFIG REQUIRED)
set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.58")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.59")
set(KDEPIMLIBS_LIB_VERSION "5.2.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.2.40")
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
......
......@@ -27,7 +27,7 @@
#include <kpimtextedit/slidecontainer.h>
#include <MessageViewer/FindBarWebEngineView>
#include <WebEngineViewer/FindBarWebEngineView>
using namespace Akregator;
......@@ -65,9 +65,9 @@ void ArticleViewerWebEngineWidgetNg::initializeLayout(KActionCollection *ac)
mSliderContainer = new KPIMTextEdit::SlideContainer(this);
mSliderContainer->setObjectName(QStringLiteral("slidercontainer"));
mFindBarWebView = new MessageViewer::FindBarWebEngineView(mArticleViewerNg, this);
mFindBarWebView = new WebEngineViewer::FindBarWebEngineView(mArticleViewerNg, this);
mFindBarWebView->setObjectName(QStringLiteral("findbarwebview"));
connect(mFindBarWebView, &MessageViewer::FindBarBase::hideFindBar, mSliderContainer, &KPIMTextEdit::SlideContainer::slideOut);
connect(mFindBarWebView, &WebEngineViewer::FindBarWebEngineView::hideFindBar, mSliderContainer, &KPIMTextEdit::SlideContainer::slideOut);
mSliderContainer->setContent(mFindBarWebView);
layout->addWidget(mSliderContainer);
connect(articleViewerNg(), &ArticleViewerWebEngine::textToSpeech, this, &ArticleViewerWebEngineWidgetNg::slotSpeakText);
......
......@@ -24,7 +24,6 @@
class KActionCollection;
namespace MessageViewer
{
class FindBarWebEngineView;
class ViewerPluginToolManager;
class ViewerPluginInterface;
}
......@@ -35,6 +34,11 @@ class SlideContainer;
class TextToSpeechWidget;
}
namespace WebEngineViewer
{
class FindBarWebEngineView;
}
namespace Akregator
{
class AKREGATOR_EXPORT ArticleViewerWebEngineWidgetNg : public QWidget
......@@ -53,7 +57,7 @@ public Q_SLOTS:
private:
void initializeActions(KActionCollection *ac);
void initializeLayout(KActionCollection *ac);
MessageViewer::FindBarWebEngineView *mFindBarWebView;
WebEngineViewer::FindBarWebEngineView *mFindBarWebView;
ArticleViewerWebEngine *mArticleViewerNg;
KPIMTextEdit::TextToSpeechWidget *mTextToSpeechWidget;
KPIMTextEdit::SlideContainer *mSliderContainer;
......
......@@ -40,7 +40,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${blogilo_SOURCE_DIR})
find_package(Qt5X11Extras NO_MODULE)
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.58")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.59")
# Find KF5 package
find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5DocTools REQUIRED)
......
......@@ -29,7 +29,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${grantleeditor_SOURCE_DIR})
set(KDEPIM_VERSION_NUMBER "5.2.44")
set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.58")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.59")
set(KDEPIMLIBS_LIB_VERSION "5.2.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.2.40")
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
......
......@@ -41,7 +41,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${importwizard_SOURCE_DIR})
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Gui)
set(LIBMAILIMPORTER_VERSION_LIB "5.2.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.58")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.59")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
set(IDENTITYMANAGEMENT_LIB_VERSION "5.2.40")
......
......@@ -68,7 +68,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${kmail_SOURCE_DIR})
set(LIBGRAVATAR_VERSION_LIB "5.2.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.40")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.42")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.58")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.59")
set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.2.40")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
......
......@@ -34,7 +34,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${sieveeditor_SOURCE_DIR})
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
set(KDEPIM_LIB_SOVERSION "5")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.58")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.59")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKSIEVE_LIB_VERSION_LIB "5.2.40")
......
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