diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-29 14:48:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-29 14:50:02 +0200 |
| commit | ae2f2d2b92fbaa56d9557219a5696e700620f884 (patch) | |
| tree | 8fad3845aa9a746478479cbe7c02841a01ac4139 /tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp | |
| parent | 26229cfa0b729313893af5674d604e8692dbb946 (diff) | |
| parent | ed05a82cd52d2f84647ad1d46b242c619b2a14e3 (diff) | |
| download | qtquick1-ae2f2d2b92fbaa56d9557219a5696e700620f884.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: Iba1819a7e10957f4bb5be90852747a4b459a3172
Diffstat (limited to 'tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp index dd50b389..f3c0abbb 100644 --- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp +++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp @@ -137,7 +137,7 @@ void tst_qdeclarativeimage::imageSource_data() if (QImageReader::supportedImageFormats().contains("SVG")) QTest::newRow("remote svg") << SERVER_ADDR "/heart.svg" << 550.0 << 500.0 << true << false << false << ""; QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << 0.0 << 0.0 << true - << false << true << "<Unknown File>:2:1: QML Image: Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found"; + << false << true << "<Unknown File>:2:1: QML Image: Error transferring " SERVER_ADDR "/no-such-file.png - server replied: Not found"; } |