diff options
| author | Sami Merilä <sami.merila@nokia.com> | 2009-06-18 14:00:10 (GMT) |
|---|---|---|
| committer | Sami Merilä <sami.merila@nokia.com> | 2009-06-18 14:00:10 (GMT) |
| commit | 402acf14686738a20b184b646a3211a7633995a0 (patch) | |
| tree | 385d2736ef8043ce5ac695b4337ebcc0e5a5a30b /demos/browser | |
| parent | 39a85ed5f0bcd590391ac7c9b005cb7612b9d765 (diff) | |
| parent | 22e27c6e3002566b39fea15bf4f05ed298818f47 (diff) | |
| download | Qt-402acf14686738a20b184b646a3211a7633995a0.zip Qt-402acf14686738a20b184b646a3211a7633995a0.tar.gz Qt-402acf14686738a20b184b646a3211a7633995a0.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'demos/browser')
| -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()) |