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

We depend against qt5.7

parent fe32ca93
......@@ -80,20 +80,6 @@ using namespace Kontact;
#include <grantleetheme/grantleethememanager.h>
#include <grantleetheme/grantleetheme.h>
#if QT_VERSION < QT_VERSION_CHECK(5,7,0)
namespace QtPrivate {
template <typename T> struct QAddConst { typedef const T Type; };
}
// this adds const to non-const objects (like std::as_const)
template <typename T>
Q_DECL_CONSTEXPR typename QtPrivate::QAddConst<T>::Type &qAsConst(T &t) Q_DECL_NOTHROW { return t; }
// prevent rvalue arguments:
template <typename T>
void qAsConst(const T &&) Q_DECL_EQ_DELETE;
#endif
// Define the maximum time Kontact waits for KSycoca to become available.
static const int KSYCOCA_WAIT_TIMEOUT = 10;
......
......@@ -35,13 +35,11 @@ IntroductionWebEnginePage::IntroductionWebEnginePage(QObject *parent)
settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessRemoteUrls, false);
settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, false);
#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
settings()->setAttribute(QWebEngineSettings::ScreenCaptureEnabled, false);
settings()->setAttribute(QWebEngineSettings::WebGLEnabled, false);
settings()->setAttribute(QWebEngineSettings::AutoLoadIconsForPage, false);
settings()->setAttribute(QWebEngineSettings::Accelerated2dCanvasEnabled, false);
settings()->setAttribute(QWebEngineSettings::WebGLEnabled, false);
#endif
#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
settings()->setAttribute(QWebEngineSettings::FocusOnNavigationEnabled, false);
......
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