diff options
| author | axis <qt-info@nokia.com> | 2009-08-21 14:29:28 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-08-21 14:29:28 (GMT) |
| commit | e190e700d707c3000f813c106c27d8f5aeda44d0 (patch) | |
| tree | 63fa8d66040ca5680b0a1b3d108a17ec2139f1e9 /demos/browser/browsermainwindow.cpp | |
| parent | 71a8a5c97315c114d55190594a7175552bfd41a6 (diff) | |
| parent | ae42be87658ad97fad48706141779ec42c02212e (diff) | |
| download | Qt-e190e700d707c3000f813c106c27d8f5aeda44d0.zip Qt-e190e700d707c3000f813c106c27d8f5aeda44d0.tar.gz Qt-e190e700d707c3000f813c106c27d8f5aeda44d0.tar.bz2 | |
Merge branch 'master' of git@scm:qt/qt-s60-public
This brings support for the S60 platform into Qt.
Diffstat (limited to 'demos/browser/browsermainwindow.cpp')
| -rw-r--r-- | demos/browser/browsermainwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/browser/browsermainwindow.cpp b/demos/browser/browsermainwindow.cpp index 8d4df01..010ed98 100644 --- a/demos/browser/browsermainwindow.cpp +++ b/demos/browser/browsermainwindow.cpp @@ -576,7 +576,7 @@ QUrl BrowserMainWindow::guessUrlFromString(const QString &string) int dotIndex = urlStr.indexOf(QLatin1Char('.')); if (dotIndex != -1) { QString prefix = urlStr.left(dotIndex).toLower(); - QByteArray schema = (prefix == QLatin1String("ftp")) ? prefix.toLatin1() : "http"; + QByteArray schema = (prefix == QLatin1String("ftp")) ? prefix.toLatin1() : QByteArray("http"); QUrl url = QUrl::fromEncoded(schema + "://" + urlStr.toUtf8(), QUrl::TolerantMode); if (url.isValid()) |