diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-20 23:30:31 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-20 23:30:31 +0100 |
| commit | e5a11fbb3251a98fafd6bebf0b6fc366acb19088 (patch) | |
| tree | 8e1bd6704205307e0a23484221ea1bb67a9f411e /tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp | |
| parent | 0646d1131b4bc65cdd9af29f4ce00fdd2398a3df (diff) | |
| parent | 76c0be34cd4ff4564693162fa7528463e23ce9d8 (diff) | |
Merge "Merge branch 'dev' into stable" into refs/staging/stable
Diffstat (limited to 'tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp')
| -rw-r--r-- | tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp index 90e6797117..d57a99a758 100644 --- a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp +++ b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp @@ -105,7 +105,7 @@ QString tst_QNetworkProxyFactory::formatProxyName(const QNetworkProxy & proxy) c { QString proxyName; if (!proxy.user().isNull()) - proxyName.append("%1:%2@").arg(proxy.user(), proxy.password()); + proxyName.append(QString("%1:%2@").arg(proxy.user(), proxy.password())); proxyName.append(QString("%1:%2").arg(proxy.hostName()).arg(proxy.port())); proxyName.append(QString(" (type=%1, capabilities=%2)").arg(proxy.type()).arg(proxy.capabilities())); |