diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-07 13:20:36 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-07 13:20:36 +0100 |
| commit | 4ab7deb923237b0186a211b0326217c480e33848 (patch) | |
| tree | e277fb616e58e02bb49e0dc62d1ff9a039e8bcdb /tests/auto/quick/qquickpixmapcache | |
| parent | c3f03bbff1db14dc5b5436d8aef834512207d498 (diff) | |
| parent | bb921064b966efdaabc2245cad21c3d852848a22 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Ica75a71062d0613e415f2433c5c22c2e251b37cd
Diffstat (limited to 'tests/auto/quick/qquickpixmapcache')
| -rw-r--r-- | tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp b/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp index 0064212a78..0fc8a7f001 100644 --- a/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp +++ b/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp @@ -148,7 +148,7 @@ void tst_qquickpixmapcache::single() QString expectedError; if (neterror) { - expectedError = "Error downloading " + target.toString() + " - server replied: Not found"; + expectedError = "Error transferring " + target.toString() + " - server replied: Not found"; } else if (!exists) { expectedError = "Cannot open: " + target.toString(); } |