Commit 7da5ba30 authored by Thomas Hartmann's avatar Thomas Hartmann

QmlDesigner: remove hard webkit dependency in qmlpuppet and Qt 5

Change-Id: Ie198a0e3d8342fb62ff51ec2475134cdf4f9dcea
Reviewed-by: default avatarMarco Bubke <marco.bubke@digia.com>
(cherry picked from commit ad535b5b)
parent e82e6749
......@@ -43,7 +43,7 @@
#include <QFileInfo>
#include <QFileSystemWatcher>
#include <QPixmapCache>
#ifndef QT_NO_WEBKIT
#if !defined(QT_NO_WEBKIT) && QT_VERSION < 0x050000
#include <QGraphicsWebView>
#endif
#include <QGraphicsObject>
......@@ -801,7 +801,7 @@ void allSubObject(QObject *object, QObjectList &objectList)
static void disableTiledBackingStore(QObject *object)
{
#ifndef QT_NO_WEBKIT
#if !defined(QT_NO_WEBKIT) && QT_VERSION < 0x050000
QGraphicsWebView *webView = qobject_cast<QGraphicsWebView*>(object);
if (webView)
webView->settings()->setAttribute(QWebSettings::TiledBackingStoreEnabled, false);
......
......@@ -6,8 +6,12 @@ greaterThan(QT_MAJOR_VERSION, 4) {
QT += declarative
}
contains (QT_CONFIG, webkit) {
QT += webkit
greaterThan(QT_MAJOR_VERSION, 4) {
} else {
contains (QT_CONFIG, webkit) {
QT += webkit
}
}
DEFINES += QWEAKPOINTER_ENABLE_ARROW
......
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