From: Alan Alpert <alan.alpert@nokia.com>
Date: Thu, 7 Jul 2011 07:24:18 +0000 (+1000)
Subject: Remove traces of webkit
X-Git-Tag: qt-v5.0.0-alpha1~2119
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=12ebf79f3a92646ae7d5671d8ba4147055d203c2;p=profile%2Fivi%2Fqtdeclarative.git

Remove traces of webkit

Removes the entire wince section for qmlviewer.pro, as wince is not yet
supported for qt5 and its unclear what damage removing the webkit part
would have done to it.

Change-Id: Ib0c721856bb7a28c3238e85c8cc93b43e6e63368
Reviewed-on: http://codereview.qt.nokia.com/1267
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
---

diff --git a/src/qtquick1/graphicsitems/qdeclarativeitemsmodule.cpp b/src/qtquick1/graphicsitems/qdeclarativeitemsmodule.cpp
index 78f13cd..47fd2dd 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeitemsmodule.cpp
+++ b/src/qtquick1/graphicsitems/qdeclarativeitemsmodule.cpp
@@ -74,10 +74,6 @@
 #include "QtQuick1/private/qdeclarativetextinput_p.h"
 #include "QtQuick1/private/qdeclarativevisualitemmodel_p.h"
 #include "QtQuick1/private/qdeclarativegraphicswidget_p.h"
-#ifdef QT_WEBKIT_LIB
-#include "QtQuick1/private/qdeclarativewebview_p.h"
-#include "QtQuick1/private/qdeclarativewebview_p_p.h"
-#endif
 #include "QtQuick1/private/qdeclarativeanchors_p.h"
 #include "QtQuick1/private/qdeclarativepincharea_p.h"
 
diff --git a/tools/qmlviewer/qmlviewer.pro b/tools/qmlviewer/qmlviewer.pro
index e9edd60..16579bb 100644
--- a/tools/qmlviewer/qmlviewer.pro
+++ b/tools/qmlviewer/qmlviewer.pro
@@ -16,22 +16,6 @@ DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
 target.path = $$[QT_INSTALL_BINS]
 INSTALLS += target
 
-wince* {
-    QT += xml
-
-    contains(QT_CONFIG, scripttools) {
-        QT += scripttools
-    }
-    contains(QT_CONFIG, phonon) {
-        QT += phonon
-    }
-    contains(QT_CONFIG, xmlpatterns) {
-        QT += xmlpatterns
-    }
-    contains(QT_CONFIG, webkit) {
-        QT += webkit
-    }
-}
 maemo5 {
     QT += maemo5
 }