[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim-apps-libs] /: Use MessageViewer::WebEngineView
From:       Montel Laurent <montel () kde ! org>
Date:       2016-04-01 5:08:25
Message-ID: E1alrJp-0004BH-4w () scm ! kde ! org
[Download RAW message or body]

Git commit fca54bc4879be1c564219e1977b7640bfb2ec277 by Montel Laurent.
Committed on 01/04/2016 at 05:08.
Pushed by mlaurent into branch 'master'.

Use MessageViewer::WebEngineView

M  +3    -1    CMakeLists.txt
M  +1    -0    composereditorwebengine/src/CMakeLists.txt
M  +1    -1    composereditorwebengine/src/composerwebengine.cpp
M  +3    -1    composereditorwebengine/src/composerwebengine.h

http://commits.kde.org/kdepim-apps-libs/fca54bc4879be1c564219e1977b7640bfb2=
ec277

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c992d3d..e683e5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ include(ECMAddTests)
 =

 =

 set(KF5_VERSION "5.19.0")
-set(KDEPIM_APPS_LIB_VERSION "5.2.41")
+set(KDEPIM_APPS_LIB_VERSION "5.2.42")
 set(KDEPIMLIBS_LIB_VERSION "5.2.40")
 set(QT_REQUIRED_VERSION "5.4.0")
 set(KMIME_LIB_VERSION "5.2.40")
@@ -29,6 +29,7 @@ set(PIMCOMMON_LIB_VERSION "5.2.40")
 set(LIBKLEO_LIB_VERSION "5.2.40")
 set(GRANTLEETHEME_LIB_VERSION "5.2.40")
 set(AKONADI_VERSION "5.2.40")
+set(MESSAGELIB_LIB_VERSION "5.2.47")
 =

 find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test UiToo=
ls WebKitWidgets DBus Gui)
@@ -52,6 +53,7 @@ find_package(KF5PimCommon ${PIMCOMMON_LIB_VERSION} CONFIG=
 REQUIRED)
 find_package(KF5CoreAddons ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5WidgetsAddons ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5MessageViewer ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED)
 =

 option(QTWEBENGINE_SUPPORT_OPTION "Enable support for qtwebengine. False b=
y default." FALSE)
 =

diff --git a/composereditorwebengine/src/CMakeLists.txt b/composereditorweb=
engine/src/CMakeLists.txt
index 153231c..9de6af9 100644
--- a/composereditorwebengine/src/CMakeLists.txt
+++ b/composereditorwebengine/src/CMakeLists.txt
@@ -37,6 +37,7 @@ target_link_libraries(KF5ComposerEditorWebEngine
     Qt5::WebEngine
     Qt5::WebEngineWidgets
     Qt5::PrintSupport
+    KF5::MessageViewer
     )
 =

 target_include_directories(KF5ComposerEditorWebEngine INTERFACE "$<INSTALL=
_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/ComposerEditorWebEngine/;${KDE_INS=
TALL_INCLUDEDIR_KF5}/composereditorwebengine>")
diff --git a/composereditorwebengine/src/composerwebengine.cpp b/composered=
itorwebengine/src/composerwebengine.cpp
index 30c1812..d9af1bf 100644
--- a/composereditorwebengine/src/composerwebengine.cpp
+++ b/composereditorwebengine/src/composerwebengine.cpp
@@ -44,7 +44,7 @@
 using namespace ComposerEditorWebEngine;
 =

 ComposerWebEngine::ComposerWebEngine(QWidget *parent)
-    : QWebEngineView(parent),
+    : MessageViewer::WebEngineView(parent),
       d(new ComposerEditorWebEngine::ComposerEditorWebEnginePrivate(this))
 {
     QFile file(initialHtml());
diff --git a/composereditorwebengine/src/composerwebengine.h b/composeredit=
orwebengine/src/composerwebengine.h
index 75474f2..30cedc3 100644
--- a/composereditorwebengine/src/composerwebengine.h
+++ b/composereditorwebengine/src/composerwebengine.h
@@ -21,13 +21,15 @@
 #define COMPOSERWEBENGINE_H
 =

 #include <QWebEngineView>
+#include <MessageViewer/WebEngineView>
+
 #include "composereditorwebengine_export.h"
 class KActionCollection;
 class KToolBar;
 namespace ComposerEditorWebEngine
 {
 class ComposerEditorWebEnginePrivate;
-class COMPOSEREDITORWEBENGINE_EXPORT ComposerWebEngine : public QWebEngine=
View
+class COMPOSEREDITORWEBENGINE_EXPORT ComposerWebEngine : public MessageVie=
wer::WebEngineView
 {
     Q_OBJECT
 public:
[prev in list] [next in list] [prev in thread] [next in thread]