diff options
| author | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2009-06-09 16:49:40 (GMT) |
|---|---|---|
| committer | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2009-06-09 16:58:26 (GMT) |
| commit | 5b24c5793607c809b1bac82c7cc3696001ee9217 (patch) | |
| tree | 9ec0196d1295fcfbc79d1fee1918ece207f505a5 /src | |
| parent | 2dc47ad36f235ba053a329179be4ed87d0b4d484 (diff) | |
| download | Qt-5b24c5793607c809b1bac82c7cc3696001ee9217.zip Qt-5b24c5793607c809b1bac82c7cc3696001ee9217.tar.gz Qt-5b24c5793607c809b1bac82c7cc3696001ee9217.tar.bz2 | |
Opening links with cyrillic file names does not work in QLabel.
QDestopServices was converting the file names to percentage encoding
before calling ShellExecute. This will not work with URLs without a
scheme. These are now being treated similar to a file.
Task-number: 254501
Reviewed-by: Jens Bache-Wiig
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/util/qdesktopservices_win.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/util/qdesktopservices_win.cpp b/src/gui/util/qdesktopservices_win.cpp index 9f8efb4..a8aa11c 100644 --- a/src/gui/util/qdesktopservices_win.cpp +++ b/src/gui/util/qdesktopservices_win.cpp @@ -165,6 +165,9 @@ static bool launchWebBrowser(const QUrl &url) if (!url.isValid()) return false; + if (url.scheme().isEmpty()) + return openDocument(url); + quintptr returnValue; returnValue = (quintptr)ShellExecute(0, 0, (TCHAR *) QString::fromUtf8(url.toEncoded().constData()).utf16(), 0, 0, SW_SHOWNORMAL); |