QmlDesigner: remove hard webkit dependency in qmlpuppet and Qt 5

Change-Id: Ie198a0e3d8342fb62ff51ec2475134cdf4f9dcea
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit ad535b5b)

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);

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