aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qjsengine/tst_qjsengine.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-11-25 08:49:45 +0100
committerQt by Nokia <qt-info@nokia.com>2011-11-28 09:06:52 +0100
commit7f20428c91bad817b2d350536756dd55a8d2103b (patch)
tree6f8fedd485d2a0a18c31560020b504bdf82efb35 /tests/auto/declarative/qjsengine/tst_qjsengine.cpp
parentd0d12171b06d568bfcc7717471f4af5b877cfc1f (diff)
QtDeclarative: Fix warnings in tests.
- Unused parameters - Missing interfaces - tst_QQuickListView: Fix call canvas->rootContext()->setContextProperty to use a QVariant (instead of implicitly converting to QObject*) which was apparently intended. Change-Id: Idc95d9408051e6f5b7005a7eccd764ac218ff867 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qjsengine/tst_qjsengine.cpp')
-rw-r--r--tests/auto/declarative/qjsengine/tst_qjsengine.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/auto/declarative/qjsengine/tst_qjsengine.cpp b/tests/auto/declarative/qjsengine/tst_qjsengine.cpp
index 8517850c5b..1c29391e0f 100644
--- a/tests/auto/declarative/qjsengine/tst_qjsengine.cpp
+++ b/tests/auto/declarative/qjsengine/tst_qjsengine.cpp
@@ -793,7 +793,7 @@ void tst_QJSEngine::newVariant_promoteNonQScriptObject()
void tst_QJSEngine::newRegExp()
{
- QSKIP("Test failing - QTBUG-22238", SkipAll);
+ QSKIP("Test failing - QTBUG-22238");
QJSEngine eng;
for (int x = 0; x < 2; ++x) {
QJSValue rexp;
@@ -817,7 +817,7 @@ void tst_QJSEngine::newRegExp()
void tst_QJSEngine::jsRegExp()
{
- QSKIP("Test failing - QTBUG-22238", SkipAll);
+ QSKIP("Test failing - QTBUG-22238");
// See ECMA-262 Section 15.10, "RegExp Objects".
// These should really be JS-only tests, as they test the implementation's
@@ -1463,7 +1463,7 @@ static QScriptValue getSetFoo(QScriptContext *ctx, QScriptEngine *)
void tst_QJSEngine::globalObjectProperties()
{
- QSKIP("Test failing - QTBUG-22238", SkipAll);
+ QSKIP("Test failing - QTBUG-22238");
// See ECMA-262 Section 15.1, "The Global Object".
QJSEngine eng;
@@ -1552,7 +1552,7 @@ void tst_QJSEngine::globalObjectEquals()
void tst_QJSEngine::globalObjectProperties_enumerate()
{
- QSKIP("Test failing - QTBUG-22238", SkipAll);
+ QSKIP("Test failing - QTBUG-22238");
QJSEngine eng;
QJSValue global = eng.globalObject();
@@ -3072,6 +3072,7 @@ class Klazz : public QWidget,
public QStandardItem,
public QGraphicsItem
{
+ Q_INTERFACES(QGraphicsItem)
Q_OBJECT
public:
Klazz(QWidget *parent = 0) : QWidget(parent) { }
@@ -6080,7 +6081,7 @@ void tst_QJSEngine::qRegExpInport_data()
void tst_QJSEngine::qRegExpInport()
{
- QSKIP("Test failing - QTBUG-22238", SkipAll);
+ QSKIP("Test failing - QTBUG-22238");
QFETCH(QRegExp, rx);
QFETCH(QString, string);