diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-14 10:14:40 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-14 10:14:40 +0200 |
| commit | 62cd360b3f2ef9e9787359a9105fd805b721b49f (patch) | |
| tree | 8bb7dd87f0914d59d94d688c32e9244ebb79cbad /tests/auto/qnetworkreply | |
| parent | 4af9cc043370846c52ec21cf874696ee650394c1 (diff) | |
| parent | 0dbd8f1b0a6df20e5502bb35e58490a9f99953a7 (diff) | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
src/script/api/qscriptengine.cpp
Diffstat (limited to 'tests/auto/qnetworkreply')
| -rw-r--r-- | tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index dd497b044b..ff79c094da 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -4113,7 +4113,7 @@ public slots: } } void startOne() { - QUrl url = "http://" + QtNetworkSettings::serverName() + "/gif/fluke.gif"; + QUrl url = "http://" + QtNetworkSettings::serverName() + "/qtest/fluke.gif"; QNetworkRequest request(url); QNetworkReply *reply = manager.get(request); reply->setParent(this); |