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/quick/qquicktextedit | |
| 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/quick/qquicktextedit')
| -rw-r--r-- | tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp index e4821e80a6..4c4a04b293 100644 --- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp @@ -2398,6 +2398,7 @@ void tst_qquicktextedit::remoteCursorDelegate() QCOMPARE(component.status(), QQmlComponent::Loading); QVERIFY(!textEditObject->findChild<QQuickItem*>("cursorInstance")); + server.sendDelayedItem(); // Wait for component to load. QTRY_COMPARE(component.status(), QQmlComponent::Ready); |