diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-07-21 01:30:20 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-07-21 01:30:20 (GMT) |
| commit | c2c28428123cfd3a3994117bfea88a0ae68f6884 (patch) | |
| tree | 336b4e9285571e2c4bd36889ac4c49928e4246f2 /tests | |
| parent | 5cfa17d144055fc58a768818e0dea0325a316e3e (diff) | |
| download | Qt-c2c28428123cfd3a3994117bfea88a0ae68f6884.zip Qt-c2c28428123cfd3a3994117bfea88a0ae68f6884.tar.gz Qt-c2c28428123cfd3a3994117bfea88a0ae68f6884.tar.bz2 | |
Ensure redirects (and indeed all reply process) is done in the right thread.
i.e. the thread with the QNAM the original reply was created in.
Task-number: QTBUG-12302
Reviewed-by: Aaron Kennedy
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp index 38fd458..b8d2828 100644 --- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp +++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp @@ -136,6 +136,7 @@ void tst_qdeclarativeimage::imageSource_data() QTest::newRow("local async not found") << QUrl::fromLocalFile(SRCDIR "/data/no-such-file-1.png").toString() << 0.0 << 0.0 << false << true << "file::2:1: QML Image: Cannot open: " + QUrl::fromLocalFile(SRCDIR "/data/no-such-file-1.png").toString(); QTest::newRow("remote") << SERVER_ADDR "/colors.png" << 120.0 << 120.0 << true << false << ""; + QTest::newRow("remote redirected") << SERVER_ADDR "/oldcolors.png" << 120.0 << 120.0 << true << false << ""; QTest::newRow("remote svg") << SERVER_ADDR "/heart.svg" << 550.0 << 500.0 << true << false << ""; QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << 0.0 << 0.0 << true << false << "file::2:1: QML Image: Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found"; @@ -155,6 +156,7 @@ void tst_qdeclarativeimage::imageSource() if (remote) { QVERIFY(server.isValid()); server.serveDirectory(SRCDIR "/data"); + server.addRedirect("oldcolors.png", SERVER_ADDR "/colors.png"); } if (!error.isEmpty()) |