More scenegraph fixes

components/Menu.qml

-import QtQuick 1.0
+import QtQuick 2.0
 import "../components/plugin"
 
 MenuBase {

components/styleitem/qtmenu.cpp

@@ -28,8 +28,8 @@
 #include "qdebug.h"
 #include <qapplication.h>
 
-QtMenu::QtMenu(QDeclarativeItem *parent)
-    : QDeclarativeItem(parent), m_selectedIndex(0), m_highlightedIndex(0)
+QtMenu::QtMenu(QSGItem *parent)
+    : QSGItem(parent), m_selectedIndex(0), m_highlightedIndex(0)
 {
     m_menu = new QMenu(0);
     connect(m_menu, SIGNAL(aboutToHide()), this, SIGNAL(menuClosed()));

components/styleitem/qtmenu.h

@@ -29,10 +29,10 @@
 
 #include <QtGui/qmenu.h>
 #include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativeitem.h>
+#include <QtDeclarative/QSGItem.h>
 #include <QtDeclarative/QDeclarativeListProperty>
 #include "qtmenuitem.h"
-class QtMenu : public QDeclarativeItem
+class QtMenu : public QSGItem
 {
     Q_OBJECT
     Q_PROPERTY(QString title READ title WRITE setTitle)
@@ -47,7 +47,7 @@ class QtMenu : public QDeclarativeItem
     Q_PROPERTY(QDeclarativeListProperty<QtMenuItem> menuItems READ menuItems NOTIFY menuItemsChanged)
     Q_CLASSINFO("DefaultProperty", "menuItems")
 public:
-    QtMenu(QDeclarativeItem *parent = 0);
+    QtMenu(QSGItem *parent = 0);
     virtual ~QtMenu();
 
     void setTitle(const QString &title);

components/styleitem/qwheelarea.cpp

@@ -41,8 +41,8 @@
 #include "qwheelarea.h"
 
 
-QWheelArea::QWheelArea(QDeclarativeItem *parent)
-    : QDeclarativeItem(parent),
+QWheelArea::QWheelArea(QSGItem *parent)
+    : QSGItem(parent),
       _horizontalMinimumValue(0),
       _horizontalMaximumValue(0),
       _verticalMinimumValue(0),
@@ -87,7 +87,7 @@ bool QWheelArea::event (QEvent * e) {
     }
     default: break;
     }
-    return QDeclarativeItem::event(e);
+    return QSGItem::event(e);
 }
 
 void QWheelArea::setHorizontalMinimumValue(qreal min)

components/styleitem/qwheelarea.h

@@ -29,13 +29,16 @@
 
 
 #include <QtCore/qobject.h>
-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativeitem.h>
+#include <QtDeclarative/qsgitem.h>
+
+//#include <QtDeclarative/qdeclarative.h>
+//#include <QtDeclarative/qdeclarativeitem.h>
+
 #include <QtCore/qcoreevent.h>
 #include <QtGui/qevent.h>
 #include <QtGui/qgraphicssceneevent.h>
 
-class QWheelArea : public QDeclarativeItem
+class QWheelArea : public QSGItem
 {
     Q_OBJECT
     Q_PROPERTY(qreal verticalDelta READ verticalDelta WRITE setVerticalDelta NOTIFY verticalWheelMoved)
@@ -49,7 +52,7 @@ class QWheelArea : public QDeclarativeItem
 
 
 public:
-    QWheelArea(QDeclarativeItem *parent = 0);
+    QWheelArea(QSGItem *parent = 0);
 
     virtual ~QWheelArea();