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 22:13:18 +0100 |
| commit | fd49b4a2b935362fa76ce3297576addf459bf120 (patch) | |
| tree | 1c5a4e3efa6d08908e1856abf7ec414105aa818e /src/corelib/io/qurl.cpp | |
| parent | 9029c5586460950b4fa6773a5d08c67e5ba16e8a (diff) | |
| parent | b9585277e78f0571933706507ba2024c68d6df19 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
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 def4a1095f7..104161bc33a 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 |