summaryrefslogtreecommitdiffstats
path: root/demos/browser/browsermainwindow.cpp
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-06-18 12:12:04 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-06-18 12:12:04 (GMT)
commit1efa82c619fe837fce65f082a6cae027dae08093 (patch)
treecb3d78f39e3041546aa018be7ef1b0952ae07ae2 /demos/browser/browsermainwindow.cpp
parentb11cac64e7a0d0ecf0295a66bf54753fc7353376 (diff)
parent0cbf534a7feba5a0159877d19d15f225e1199fc8 (diff)
downloadQt-1efa82c619fe837fce65f082a6cae027dae08093.zip
Qt-1efa82c619fe837fce65f082a6cae027dae08093.tar.gz
Qt-1efa82c619fe837fce65f082a6cae027dae08093.tar.bz2
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'demos/browser/browsermainwindow.cpp')
-rw-r--r--demos/browser/browsermainwindow.cpp2
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())