aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-06-13 12:08:03 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-13 16:13:46 +0200
commit5eeffd021996f1bae32973681aa4db3e354aacdb (patch)
treee7c7d1b90d7188ca4b9a4cc525f022be9aa5337d
parent6a1f3c1b355ae1834ed6b6515a575f46f6f58897 (diff)
QtQuick: Fix warnings about unused variables.
Change-Id: Ibe134810cc67e30a61b42ffa3be73f59c2ef96a2 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
-rw-r--r--src/qml/qml/qqmlpropertycache.cpp2
-rw-r--r--src/qmltest/quicktestresult.cpp1
-rw-r--r--src/quick/items/qquickdrag.cpp2
3 files changed, 0 insertions, 5 deletions
diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp
index b665bc9d1c..14e474e67d 100644
--- 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 2fbede45d7..94f45c4393 100644
--- 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 a6fe87d05b..722dbb6b97 100644
--- 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;