diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-04-20 09:27:01 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-20 02:26:23 +0200 |
| commit | 360f0d00088cc84791e7a197b20a325bfdac9eb3 (patch) | |
| tree | 88b38436920dca8ec5486c1cdc852dff7f8b0fd7 /src/qml/qml/v4 | |
| parent | b93e463465f5c4241d2dae9aaaa198684e1199fb (diff) | |
Use QUrl constructor directly.
setEncodedUrl is deprecated, and no longer required as the new QUrl
makes this behavior default. This is a partial revert of
3aa53b8bc383ebcdf8dc922b2670170ec012949f.
Change-Id: I14f29cbe2a2e2cd9c41f7afc92b1cb66b53996bb
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Diffstat (limited to 'src/qml/qml/v4')
| -rw-r--r-- | src/qml/qml/v4/qv4bindings.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/qml/qml/v4/qv4bindings.cpp b/src/qml/qml/v4/qv4bindings.cpp index e055cad4f2..db6811f74f 100644 --- a/src/qml/qml/v4/qv4bindings.cpp +++ b/src/qml/qml/v4/qv4bindings.cpp @@ -1063,9 +1063,7 @@ void QV4Bindings::run(int instrIndex, quint32 &executedBlocks, output.cleanupString(); MARK_CLEAN_REGISTER(instr->unaryop.output); } - QUrl *urlPtr = output.geturlptr(); - new (urlPtr) QUrl(); - urlPtr->setEncodedUrl(tmp.toUtf8(), QUrl::TolerantMode); + new (output.geturlptr()) QUrl(tmp); URL_REGISTER(instr->unaryop.output); } |