diff options
author | mread <qt-info@nokia.com> | 2009-06-18 12:31:04 (GMT) |
---|---|---|
committer | mread <qt-info@nokia.com> | 2009-06-18 12:31:04 (GMT) |
commit | 22e27c6e3002566b39fea15bf4f05ed298818f47 (patch) | |
tree | c5e551a5faf801b2c34051c4b452a2b0251108d4 /demos/browser/browsermainwindow.cpp | |
parent | 821d87030693432b2eb5db0cdbc50c14196b3c90 (diff) | |
parent | 1efa82c619fe837fce65f082a6cae027dae08093 (diff) | |
download | Qt-22e27c6e3002566b39fea15bf4f05ed298818f47.zip Qt-22e27c6e3002566b39fea15bf4f05ed298818f47.tar.gz Qt-22e27c6e3002566b39fea15bf4f05ed298818f47.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
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 f1dcaef..37b8ddc 100644 --- a/demos/browser/browsermainwindow.cpp +++ b/demos/browser/browsermainwindow.cpp @@ -575,7 +575,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()) |