diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-01 20:28:27 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-01 20:28:38 +0200 |
| commit | 64faeb0d8003e699a4d09e7dcee1ef6eb10302ad (patch) | |
| tree | 6dcbca91651e373e045181a82a8c8c2a380f8f8a /tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp | |
| parent | 92c847e56d94c9032f3fa83922742e455233e4f3 (diff) | |
| parent | 857fc5ec4644a6111ba8725e4e1a84dd5ea6bfca (diff) | |
| download | qtquick1-64faeb0d8003e699a4d09e7dcee1ef6eb10302ad.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: I39ab590ec2c95b3c213e90dad5a8f5e3e626baab
Diffstat (limited to 'tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp index 7e9dad5c..6d26b3a6 100644 --- a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp +++ b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp @@ -110,7 +110,7 @@ void tst_qdeclarativeborderimage::imageSource_data() << "<Unknown File>:2:1: QML BorderImage: Cannot open: " + QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString(); QTest::newRow("remote") << SERVER_ADDR "/colors.png" << true << ""; QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << true - << "<Unknown File>:2:1: QML BorderImage: Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found"; + << "<Unknown File>:2:1: QML BorderImage: Error transferring " SERVER_ADDR "/no-such-file.png - server replied: Not found"; } void tst_qdeclarativeborderimage::imageSource() |