diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-02-03 10:46:26 +1000 |
|---|---|---|
| committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-02-03 02:17:37 +0100 |
| commit | c5fe7a2d74e7690650e089861ddb7c5b495d72e5 (patch) | |
| tree | 02f1f6fe3a0beb2c689e58b90746adb41d0c4d22 /tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp | |
| parent | 6340b2f4b4c76cee4f7ec24d870d5a8e42163330 (diff) | |
Fix qdeclarativedebug* test failures.
Add a copy of the qmldbg_tcp plugin to be built when the qtdeclarative
module is not available, and fix a failure due to metatype enum
reordering.
Change-Id: I0c0a40bffba327d3342b5def4f6de331ad65e177
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp')
| -rw-r--r-- | tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp index eb8e8d87..804c7b5a 100644 --- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp +++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp @@ -221,7 +221,7 @@ void tst_QDeclarativeDebug::recursiveObjectTest(QObject *o, const QDeclarativeDe QCOMPARE(p.name(), QString::fromUtf8(pmeta.name())); - if (pmeta.type() > 0 && pmeta.type() < QVariant::UserType) // TODO test complex types + if (pmeta.type() > 0 && pmeta.type() < QVariant::UserType && pmeta.userType() != QMetaType::QVariant) // TODO test complex types QCOMPARE(p.value(), pmeta.read(o)); if (p.name() == "parent") |