From dbf35e498db723ae9850686e462ec4f45bc7b67c Mon Sep 17 00:00:00 2001
From: Matthew Vogt <matthew.vogt@nokia.com>
Date: Tue, 31 Jan 2012 11:22:08 +1000
Subject: Modify QtQuick1 to build in Qt5

Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba
Reviewed-by: Martin Jones <martin.jones@nokia.com>
---
 src/declarative/qml/qdeclarativeengine.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/declarative/qml/qdeclarativeengine.cpp')

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 39a1733e..af9d0d8f 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -96,7 +96,6 @@
 #include <QtCore/qmutex.h>
 #include <QtGui/qcolor.h>
 #include <QtGui/qvector3d.h>
-#include <QtGui/qsound.h>
 #include <QtCore/qcryptographichash.h>
 
 #include <private/qobject_p.h>
@@ -552,7 +551,9 @@ void QDeclarativeData::destroyed(QAbstractDeclarativeData *d, QObject *o)
 
 void QDeclarativeData::parentChanged(QAbstractDeclarativeData *d, QObject *o, QObject *p)
 {
-    static_cast<QDeclarativeData *>(d)->parentChanged(o, p);
+    Q_UNUSED(d)
+    Q_UNUSED(o)
+    Q_UNUSED(p)
 }
 
 void QDeclarativeData::objectNameChanged(QAbstractDeclarativeData *d, QObject *o)
@@ -1169,11 +1170,6 @@ void QDeclarativeData::destroyed(QObject *object)
         delete this;
 }
 
-void QDeclarativeData::parentChanged(QObject *, QObject *parent)
-{
-    if (!parent && scriptValue) { delete scriptValue; scriptValue = 0; }
-}
-
 void QDeclarativeData::objectNameChanged(QObject *)
 {
     if (extendedData) objectNameNotifier()->notify();
-- 
cgit v1.2.3