aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-06-13 12:10:18 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-20 17:22:31 +0200
commit58f3f50c43f021ebfe214062562498d02b6f2071 (patch)
tree17e02ef27ee8d0e76eaf25f800836121b4c9b85e /tests/auto/qml
parente884e15615dc97c95704835756680b9c38be29ea (diff)
Fix warnings in declarative tests.
- Unused variables and test data. - () around operator &&. - Conversion of false to 0-pointer where QVariant was intended. - Missing enumeration value. - Remove duplicated qqmlecmascript entry from qml.pro (has an internal check for no-widgets). Change-Id: Ie030167e22bce26e3988a4406c630fb460f61a3c Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto/qml')
-rw-r--r--tests/auto/qml/debugger/shared/qqmldebugtestservice.cpp2
-rw-r--r--tests/auto/qml/qml.pro3
-rw-r--r--tests/auto/qml/qqmlecmascript/testtypes.cpp2
-rw-r--r--tests/auto/qml/qqmlecmascript/testtypes.h3
4 files changed, 3 insertions, 7 deletions
diff --git a/tests/auto/qml/debugger/shared/qqmldebugtestservice.cpp b/tests/auto/qml/debugger/shared/qqmldebugtestservice.cpp
index 33f5fc6ab9..884bb7a704 100644
--- a/tests/auto/qml/debugger/shared/qqmldebugtestservice.cpp
+++ b/tests/auto/qml/debugger/shared/qqmldebugtestservice.cpp
@@ -54,7 +54,7 @@ void QQmlDebugTestService::messageReceived(const QByteArray &ba)
QMetaObject::invokeMethod(this, "_sendMessage", Qt::QueuedConnection, Q_ARG(QByteArray, ba));
}
-void QQmlDebugTestService::stateAboutToBeChanged(QQmlDebugService::State state)
+void QQmlDebugTestService::stateAboutToBeChanged(QQmlDebugService::State)
{
Q_ASSERT(QThread::currentThread() != thread());
}
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index dc6c0def56..e41c261b64 100644
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -52,9 +52,6 @@ PRIVATETESTS += \
PUBLICTESTS += \
qjsengine \
qjsvalue
-
- PRIVATETESTS += \
- qqmlecmascript
}
SUBDIRS += $$PUBLICTESTS
diff --git a/tests/auto/qml/qqmlecmascript/testtypes.cpp b/tests/auto/qml/qqmlecmascript/testtypes.cpp
index f192cbc6c6..f488c6a14e 100644
--- a/tests/auto/qml/qqmlecmascript/testtypes.cpp
+++ b/tests/auto/qml/qqmlecmascript/testtypes.cpp
@@ -104,7 +104,7 @@ public:
void setWidth(int) { }
};
-void MyQmlObject::v8function(QQmlV8Function *args)
+void MyQmlObject::v8function(QQmlV8Function *)
{
const char *error = "Exception thrown from within QObject slot";
v8::ThrowException(v8::Exception::Error(v8::String::New(error)));
diff --git a/tests/auto/qml/qqmlecmascript/testtypes.h b/tests/auto/qml/qqmlecmascript/testtypes.h
index 3c12264852..2631002719 100644
--- a/tests/auto/qml/qqmlecmascript/testtypes.h
+++ b/tests/auto/qml/qqmlecmascript/testtypes.h
@@ -1158,9 +1158,8 @@ public:
m_referenced.MakeWeak(static_cast<void*>(this), wrcallback);
}
- static void wrcallback(v8::Persistent<v8::Value> handle, void *params)
+ static void wrcallback(v8::Persistent<v8::Value> handle, void *)
{
- CircularReferenceHandle *crh = static_cast<CircularReferenceHandle*>(params);
qPersistentDispose(handle);
}