diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-02-18 09:26:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-02-18 09:26:53 +0100 |
| commit | b9585277e78f0571933706507ba2024c68d6df19 (patch) | |
| tree | c98577aae762b75d0ac6437c1ec68da0ddb4426b /src/corelib/io/qurl.cpp | |
| parent | eb2af9d923923255b276c6549ada1ed7839d5dd8 (diff) | |
| parent | d7b6c4288f2de8b0123c888e83a3fbcd84ed906f (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/corelib/tools/qlinkedlist.h
src/plugins/platforms/wasm/qwasmintegration.cpp
src/plugins/platforms/wasm/qwasmscreen.cpp
Change-Id: Iefca7f9f4966bdc20e7052aca736874861055738
Diffstat (limited to 'src/corelib/io/qurl.cpp')
| -rw-r--r-- | src/corelib/io/qurl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index def4a1095f..104161bc33 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -4192,7 +4192,7 @@ static bool isIp6(const QString &text) /*! Returns a valid URL from a user supplied \a userInput string if one can be - deducted. In the case that is not possible, an invalid QUrl() is returned. + deduced. In the case that is not possible, an invalid QUrl() is returned. This overload takes a \a workingDirectory path, in order to be able to handle relative paths. This is especially useful when handling command |