diff options
| author | David Faure <david.faure@kdab.com> | 2020-08-22 15:08:02 +0200 |
|---|---|---|
| committer | David Faure <david.faure@kdab.com> | 2020-08-23 11:29:14 +0200 |
| commit | 1e88b03d1a7da6d9863b1f29e30b91d271be5dbb (patch) | |
| tree | ab3b99538cd5e332edc945e48aecf17b84704783 /src/corelib/io/qurl.h | |
| parent | 6c19d1c5eaf2417afa6475fdaf470cc4c3896899 (diff) | |
Merge the two QUrl::fromUserInput overloads
Change-Id: I4d4cd0961c30e898118c0a5f74bcd3234173384a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qurl.h')
| -rw-r--r-- | src/corelib/io/qurl.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index b8c4c881be..3646bf52fb 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -205,9 +205,7 @@ public: }; Q_DECLARE_FLAGS(UserInputResolutionOptions, UserInputResolutionOption) - static QUrl fromUserInput(const QString &userInput); - // ### Qt6 merge with fromUserInput(QString), by adding = QString() - static QUrl fromUserInput(const QString &userInput, const QString &workingDirectory, + static QUrl fromUserInput(const QString &userInput, const QString &workingDirectory = QString(), UserInputResolutionOptions options = DefaultResolution); bool isValid() const; |