diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:30:12 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:30:12 +0100 |
| commit | 11484c7f64b5942994a1d1a07f4e7f4d86e94e83 (patch) | |
| tree | f0c901d1d15d0bcb8ce572a04b094e510cd86ddd /tests/auto/qml/qqmlecmascript | |
| parent | a1a7679028eda395d74cd1247a8c3ed46ac3bef1 (diff) | |
| parent | b58953fae3dc80c52e846d2d87856dd20b8986ab (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro
Change-Id: I2fd99ed8bd03302b9bbf31e6f21990f6455c4f1c
Diffstat (limited to 'tests/auto/qml/qqmlecmascript')
| -rw-r--r-- | tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp index 93f3b66504..d022e9dedc 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -1496,7 +1496,7 @@ void tst_qqmlecmascript::componentCreation() if (creationError.isEmpty()) { QVERIFY(created); - QObject *expectedParent; + QObject *expectedParent = reinterpret_cast<QObject *>(quintptr(-1)); if (createdParent == QLatin1String("obj")) { expectedParent = object; } else if ((createdParent == QLatin1String("null")) || createdParent.isEmpty()) { |