Commit 32f6e7da authored by Laurent Montel's avatar Laurent Montel 😁

Adapt to new api

parent b42d1a87
......@@ -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.59")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
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.59")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
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.59")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
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.59")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
set(KDEPIMLIBS_LIB_VERSION "5.2.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.2.40")
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
......
......@@ -37,7 +37,7 @@
#include "treenode.h"
#include "treenodevisitor.h"
#include <MessageViewer/ZoomActionMenu>
#include <WebEngineViewer/ZoomActionMenu>
#include <kactionmenu.h>
#include <ktoolbarpopupaction.h>
......@@ -122,7 +122,7 @@ public:
KActionCollection *actionCollection;
TabWidget *tabWidget;
PimCommon::ShareServiceUrlManager *shareServiceManager;
MessageViewer::ZoomActionMenu *zoomActionMenu;
WebEngineViewer::ZoomActionMenu *zoomActionMenu;
QAction *mQuickSearchAction;
};
......@@ -580,8 +580,8 @@ void ActionManagerImpl::initTabWidget(TabWidget *tabWidget)
connect(action, &QAction::triggered, d->tabWidget, &TabWidget::slotCloseTab);
coll->setDefaultShortcuts(action, KStandardShortcut::close());
d->zoomActionMenu = new MessageViewer::ZoomActionMenu(this);
connect(d->zoomActionMenu, &MessageViewer::ZoomActionMenu::zoomChanged, d->tabWidget, &TabWidget::slotZoomChanged);
d->zoomActionMenu = new WebEngineViewer::ZoomActionMenu(this);
connect(d->zoomActionMenu, &WebEngineViewer::ZoomActionMenu::zoomChanged, d->tabWidget, &TabWidget::slotZoomChanged);
d->zoomActionMenu->setActionCollection(coll);
d->zoomActionMenu->createZoomActions();
......@@ -655,7 +655,7 @@ void ActionManagerImpl::setArticleActionsEnabled(bool enabled)
#undef setActionEnabled
}
MessageViewer::ZoomActionMenu *ActionManagerImpl::zoomActionMenu() const
WebEngineViewer::ZoomActionMenu *ActionManagerImpl::zoomActionMenu() const
{
return d->zoomActionMenu;
}
......
......@@ -32,7 +32,7 @@ class KActionCollection;
class QWidget;
namespace MessageViewer
namespace WebEngineViewer
{
class ZoomActionMenu;
}
......@@ -71,7 +71,7 @@ public:
void setArticleActionsEnabled(bool enabled) Q_DECL_OVERRIDE;
void setTrayIcon(TrayIcon *trayIcon);
KActionCollection *actionCollection() const;
MessageViewer::ZoomActionMenu *zoomActionMenu() const;
WebEngineViewer::ZoomActionMenu *zoomActionMenu() const;
QString quickSearchLineText() const;
public Q_SLOTS:
......
......@@ -62,7 +62,7 @@
#include "treenodevisitor.h"
#include "types.h"
#include "mainframe.h"
#include <MessageViewer/ZoomActionMenu>
#include <WebEngineViewer/ZoomActionMenu>
#include "job/downloadarticlejob.h"
#include <QAction>
......
......@@ -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.59")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
# 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.59")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
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.59")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
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.59")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
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.59")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
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