From 40a8d38c68258623da468483b75c5256240d0557 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Mon, 15 Feb 2010 13:04:59 +1000
Subject: Fix compile with -no-webkit

---
 src/declarative/graphicsitems/qmlgraphicsitem.h          | 2 ++
 src/declarative/graphicsitems/qmlgraphicsitemsmodule.cpp | 6 ++++++
 src/declarative/graphicsitems/qmlgraphicswebview_p.h     | 1 -
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.h b/src/declarative/graphicsitems/qmlgraphicsitem.h
index 8ae2d5c..e0f33c7 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitem.h
+++ b/src/declarative/graphicsitems/qmlgraphicsitem.h
@@ -50,6 +50,7 @@
 #include <QtGui/qgraphicsitem.h>
 #include <QtGui/qgraphicstransform.h>
 #include <QtGui/qfont.h>
+#include <QtGui/qaction.h>
 
 QT_BEGIN_HEADER
 
@@ -233,6 +234,7 @@ QML_DECLARE_TYPE(QmlGraphicsItem)
 QML_DECLARE_TYPE(QGraphicsTransform)
 QML_DECLARE_TYPE(QGraphicsScale)
 QML_DECLARE_TYPE(QGraphicsRotation)
+QML_DECLARE_TYPE(QAction)
 
 QT_END_HEADER
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsitemsmodule.cpp b/src/declarative/graphicsitems/qmlgraphicsitemsmodule.cpp
index d2cfb1a..127aec8 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitemsmodule.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsitemsmodule.cpp
@@ -74,8 +74,10 @@
 #include "qmlgraphicstextedit_p.h"
 #include "qmlgraphicstextinput_p.h"
 #include "qmlgraphicsvisualitemmodel_p.h"
+#ifdef QT_WEBKIT_LIB
 #include "qmlgraphicswebview_p.h"
 #include "qmlgraphicswebview_p_p.h"
+#endif
 #include "qmlgraphicsanchors_p.h"
 
 #define QML_REGISTER_TYPE(URI,VMAJ,VMIN,TYPE,CLASS) \
@@ -140,7 +142,9 @@ void QmlGraphicsItemModule::defineModule()
     QML_REGISTER_TYPE(Qt,4,6,VisibleArea,QmlGraphicsFlickableVisibleArea);
     QML_REGISTER_TYPE(Qt,4,6,VisualDataModel,QmlGraphicsVisualDataModel);
     QML_REGISTER_TYPE(Qt,4,6,VisualItemModel,QmlGraphicsVisualItemModel);
+#ifdef QT_WEBKIT_LIB
     QML_REGISTER_TYPE(Qt,4,6,WebView,QmlGraphicsWebView);
+#endif
 
     QML_REGISTER_NOCREATE_TYPE(QmlGraphicsAnchors);
     QML_REGISTER_NOCREATE_TYPE(QGraphicsEffect);
@@ -154,5 +158,7 @@ void QmlGraphicsItemModule::defineModule()
     QML_REGISTER_NOCREATE_TYPE(QValidator);
     QML_REGISTER_NOCREATE_TYPE(QmlGraphicsVisualModel);
     QML_REGISTER_NOCREATE_TYPE(QAction);
+#ifdef QT_WEBKIT_LIB
     QML_REGISTER_NOCREATE_TYPE(QmlGraphicsWebSettings);
+#endif
 }
diff --git a/src/declarative/graphicsitems/qmlgraphicswebview_p.h b/src/declarative/graphicsitems/qmlgraphicswebview_p.h
index c370c59..0aaf895 100644
--- a/src/declarative/graphicsitems/qmlgraphicswebview_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicswebview_p.h
@@ -275,7 +275,6 @@ QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QmlGraphicsWebView)
 QML_DECLARE_TYPEINFO(QmlGraphicsWebView, QML_HAS_ATTACHED_PROPERTIES)
-QML_DECLARE_TYPE(QAction)
 
 QT_END_HEADER
 
-- 
cgit v0.12