diff --git a/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp index ad48548cbe154d787f8d54cdc71bccd69dbee520..9162b39f3eae50bb0572a059070fbf0aeff3bf07 100644 --- a/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp @@ -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); diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri b/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri index 81ed4cfb00e4b1638d3784024f5cb1960a0497f7..168a2688365392b43a6274878440063985a5d4bd 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri @@ -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