Commit 107b48e4 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Install headers

parent 6fd73691
......@@ -78,7 +78,7 @@ if (QTWEBENGINE_EXPERIMENTAL_OPTION)
set(libmessageviewer_mailviewer_SRCS
viewer/webengine/mailwebengineview.cpp
viewer/webengine/mailwebenginepage.cpp
viewer/webengine/webengineaccesskey.cpp
viewer/webengine/mailwebengineaccesskey.cpp
viewer/webengine/mailwebhittestresult.cpp
${libmessageviewer_mailviewer_SRCS}
findbar/findbarwebengineview.cpp
......@@ -317,6 +317,18 @@ ecm_generate_headers(MessageViewer_Camelcasewebviewer_HEADERS
RELATIVE viewer/webview
)
if (QTWEBENGINE_EXPERIMENTAL_OPTION)
ecm_generate_headers(MessageViewer_Camelcasewebengine_HEADERS
HEADER_NAMES
MailWebHitTestResult
MailWebEnginePage
MailWebEngineAccessKey
MailWebEngineView
REQUIRED_HEADERS MessageViewer_webengine_HEADERS
PREFIX MessageViewer
RELATIVE viewer/webengine
)
endif()
ecm_generate_headers(MessageViewer_Camelcaseviewer_HEADERS
HEADER_NAMES
......@@ -490,6 +502,7 @@ ecm_generate_pri_file(BASE_NAME MessageViewer
install(FILES
${MessageViewer_Camelcasewebengine_HEADERS}
${MessageViewer_CamelfindbarWebEngine_HEADERS}
${MessageViewer_Camelcasewebviewer_HEADERS}
${MessageViewer_Camelcaseheader_HEADERS}
......@@ -511,6 +524,7 @@ install(FILES
)
install(FILES
${MessageViewer_webengine_HEADERS}
${MessageViewer_findbarWebEngine_HEADERS}
${MessageViewer_adblockcommon_HEADERS}
${MessageViewer_webviewer_HEADERS}
......
......@@ -15,7 +15,7 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "webengineaccesskey.h"
#include "mailwebengineaccesskey.h"
using namespace MessageViewer;
......
......@@ -18,11 +18,12 @@
#ifndef MAILWEBENGINEACCESSKEY_H
#define MAILWEBENGINEACCESSKEY_H
#include "messageviewer_export.h"
#include <QObject>
namespace MessageViewer
{
class MailWebEngineAccessKey : public QObject
class MESSAGEVIEWER_EXPORT MailWebEngineAccessKey : public QObject
{
Q_OBJECT
public:
......
......@@ -18,11 +18,12 @@
#ifndef MAILWEBENGINEPAGE_H
#define MAILWEBENGINEPAGE_H
#include "messageviewer_export.h"
#include <QWebEnginePage>
namespace MessageViewer
{
class MailWebEnginePage : public QWebEnginePage
class MESSAGEVIEWER_EXPORT MailWebEnginePage : public QWebEnginePage
{
Q_OBJECT
public:
......
......@@ -17,12 +17,12 @@
#ifndef MAILWEBENGINE_H
#define MAILWEBENGINE_H
#include "messageviewer_export.h"
#include <QWebEngineView>
namespace MessageViewer
{
class MailWebEngineView : public QWebEngineView
class MESSAGEVIEWER_EXPORT MailWebEngineView : public QWebEngineView
{
Q_OBJECT
public:
......
......@@ -40,7 +40,7 @@
using namespace MessageViewer;
WebHitTestResult::WebHitTestResult(QWebEnginePage *page, const QPoint &pos)
MailWebHitTestResult::MailWebHitTestResult(QWebEnginePage *page, const QPoint &pos)
: m_isNull(true)
, m_isContentEditable(false)
, m_isContentSelected(false)
......@@ -106,7 +106,7 @@ WebHitTestResult::WebHitTestResult(QWebEnginePage *page, const QPoint &pos)
init(page->url(), execJavaScript(page, js).toMap());
}
QVariant WebHitTestResult::execJavaScript(QWebEnginePage *page, const QString &scriptSource, int timeout)
QVariant MailWebHitTestResult::execJavaScript(QWebEnginePage *page, const QString &scriptSource, int timeout)
{
QPointer<QEventLoop> loop = new QEventLoop;
QVariant result;
......@@ -126,72 +126,72 @@ QVariant WebHitTestResult::execJavaScript(QWebEnginePage *page, const QString &s
}
QString WebHitTestResult::alternateText() const
QString MailWebHitTestResult::alternateText() const
{
return m_alternateText;
}
QRect WebHitTestResult::boundingRect() const
QRect MailWebHitTestResult::boundingRect() const
{
return m_boundingRect;
}
QUrl WebHitTestResult::imageUrl() const
QUrl MailWebHitTestResult::imageUrl() const
{
return m_imageUrl;
}
bool WebHitTestResult::isContentEditable() const
bool MailWebHitTestResult::isContentEditable() const
{
return m_isContentEditable;
}
bool WebHitTestResult::isContentSelected() const
bool MailWebHitTestResult::isContentSelected() const
{
return m_isContentSelected;
}
bool WebHitTestResult::isNull() const
bool MailWebHitTestResult::isNull() const
{
return m_isNull;
}
QString WebHitTestResult::linkTitle() const
QString MailWebHitTestResult::linkTitle() const
{
return m_linkTitle;
}
QUrl WebHitTestResult::linkUrl() const
QUrl MailWebHitTestResult::linkUrl() const
{
return m_linkUrl;
}
QUrl WebHitTestResult::mediaUrl() const
QUrl MailWebHitTestResult::mediaUrl() const
{
return m_mediaUrl;
}
bool WebHitTestResult::mediaPaused() const
bool MailWebHitTestResult::mediaPaused() const
{
return m_mediaPaused;
}
bool WebHitTestResult::mediaMuted() const
bool MailWebHitTestResult::mediaMuted() const
{
return m_mediaMuted;
}
QPoint WebHitTestResult::pos() const
QPoint MailWebHitTestResult::pos() const
{
return m_pos;
}
QString WebHitTestResult::tagName() const
QString MailWebHitTestResult::tagName() const
{
return m_tagName;
}
void WebHitTestResult::init(const QUrl &url, const QVariantMap &map)
void MailWebHitTestResult::init(const QUrl &url, const QVariantMap &map)
{
if (map.isEmpty())
return;
......
......@@ -35,6 +35,7 @@
#ifndef MAILWEBHITTESTRESULT_H
#define MAILWEBHITTESTRESULT_H
#include "messageviewer_export.h"
#include <QUrl>
#include <QRect>
#include <QString>
......@@ -43,10 +44,10 @@
class QWebEnginePage;
namespace MessageViewer
{
class WebHitTestResult
class MESSAGEVIEWER_EXPORT MailWebHitTestResult
{
public:
explicit WebHitTestResult(QWebEnginePage *page, const QPoint &pos);
explicit MailWebHitTestResult(QWebEnginePage *page, const QPoint &pos);
QString alternateText() const;
QRect boundingRect() const;
......
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