diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-04-15 07:06:39 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-04-15 07:06:39 (GMT) |
| commit | 519bf02008b8e6f1bf5154ce5c384049c3ebb0d7 (patch) | |
| tree | aa325674b7f86749d630f5eb587651007f6a10ca /tests/auto/qnetworkreply | |
| parent | 6e189eb28161f2d09e0c71ecd590b7ccfd82321c (diff) | |
| parent | 414ff1be28af440f1e01a38e497227f3849e8e54 (diff) | |
| download | Qt-519bf02008b8e6f1bf5154ce5c384049c3ebb0d7.zip Qt-519bf02008b8e6f1bf5154ce5c384049c3ebb0d7.tar.gz Qt-519bf02008b8e6f1bf5154ce5c384049c3ebb0d7.tar.bz2 | |
Merge remote branch 'staging/4.7' into bearermanagement/qconfig
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 dd497b0..ff79c09 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); |