QtQuick: Fix warnings about unused variables.

Change-Id: Ibe134810cc67e30a61b42ffa3be73f59c2ef96a2
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp
index b665bc9..14e474e 100644 (file)
--- a/src/qml/qml/qqmlpropertycache.cpp
+++ b/src/qml/qml/qqmlpropertycache.cpp
@@ -1238,7 +1238,6 @@ void QQmlPropertyCache::toMetaObjectBuilder(QMetaObjectBuilder &builder)
             // Overrides can cause the entry to already exist
             if (!methods.contains(entry)) methods.append(entry);
 
-            QQmlPropertyData *olddata = data;
             data = This->overrideData(data);
             if (data && !data->isFunction()) Insert::in(This, properties, methods, iter, data);
         } else {
@@ -1249,7 +1248,6 @@ void QQmlPropertyCache::toMetaObjectBuilder(QMetaObjectBuilder &builder)
             // Overrides can cause the entry to already exist
             if (!properties.contains(entry)) properties.append(entry);
 
-            QQmlPropertyData *olddata = data;
             data = This->overrideData(data);
             if (data) Insert::in(This, properties, methods, iter, data);
         }

diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp
index 2fbede4..94f45c4 100644 (file)
--- a/src/qmltest/quicktestresult.cpp
+++ b/src/qmltest/quicktestresult.cpp
@@ -588,7 +588,6 @@ void QuickTestResult::stopBenchmark()
 
 QObject *QuickTestResult::grabImage(QQuickItem *item)
 {
-    Q_D(QuickTestResult);
     if (item) {
         QQuickCanvas *canvas = item->canvas();
         QImage grabbed = canvas->grabFrameBuffer();

diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp
index a6fe87d..722dbb6 100644 (file)
--- a/src/quick/items/qquickdrag.cpp
+++ b/src/quick/items/qquickdrag.cpp
@@ -135,7 +135,6 @@ public:
 
 void QQuickDragAttachedPrivate::itemGeometryChanged(QQuickItem *, const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    Q_Q(QQuickDragAttached);
     if (newGeometry.topLeft() == oldGeometry.topLeft() || !active || itemMoved)
         return;
     updatePosition();
@@ -143,7 +142,6 @@ void QQuickDragAttachedPrivate::itemGeometryChanged(QQuickItem *, const QRectF &
 
 void QQuickDragAttachedPrivate::itemParentChanged(QQuickItem *, QQuickItem *)
 {
-    Q_Q(QQuickDragAttached);
     if (!active || dragRestarted)
         return;