diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-23 18:27:44 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-23 18:28:44 +0100 |
| commit | 44b7d97d565677d6decbef2d010709bdb3d7cbd4 (patch) | |
| tree | 853e6504899a735ff2ea02df54cf7acd07fde52f /tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp | |
| parent | 40574b466a5773fdb7ccddded45e237df375d848 (diff) | |
| parent | 742cff521a366e907ceddbd441b8a34101e58d01 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I1656c712dfe99bc37d8ff21caa4ea51c3b375952
Diffstat (limited to 'tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp')
| -rw-r--r-- | tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp index 5b2ac2525e..0139e156c3 100644 --- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp @@ -2329,7 +2329,7 @@ void tst_qquicktextedit::cursorDelegate() void tst_qquicktextedit::remoteCursorDelegate() { TestHTTPServer server(SERVER_PORT); - server.serveDirectory(dataDirectory()); + server.serveDirectory(dataDirectory(), TestHTTPServer::Delay); QQuickView view; |