From 11a7354c9e14ba30dd4504e85ce5c736db3528e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Thu, 6 Dec 2012 15:26:40 +0100 Subject: Allow fancy browser to navigate to Urls with missing scheme. User-entered urls are now sanitized through QUrl::fromUserInput, which adds missing default schemes. Task-number: QTBUG-28401 Change-Id: I42d33095d84ed2a95745e12832aa966be561753d Reviewed-by: Simon Hausmann Reviewed-by: Zeno Albisser Reviewed-by: Pierre Rossi --- examples/webkit/fancybrowser/main.cpp | 2 +- examples/webkit/fancybrowser/mainwindow.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/webkit/fancybrowser/main.cpp b/examples/webkit/fancybrowser/main.cpp index ceb0f9a..f671a7d 100644 --- a/examples/webkit/fancybrowser/main.cpp +++ b/examples/webkit/fancybrowser/main.cpp @@ -46,7 +46,7 @@ int main(int argc, char * argv[]) QApplication app(argc, argv); QUrl url; if (argc > 1) - url = QUrl(argv[1]); + url = QUrl::fromUserInput(argv[1]); else url = QUrl("http://www.google.com/ncr"); MainWindow *browser = new MainWindow(url); diff --git a/examples/webkit/fancybrowser/mainwindow.cpp b/examples/webkit/fancybrowser/mainwindow.cpp index e29f958..f540368 100644 --- a/examples/webkit/fancybrowser/mainwindow.cpp +++ b/examples/webkit/fancybrowser/mainwindow.cpp @@ -131,7 +131,7 @@ void MainWindow::adjustLocation() void MainWindow::changeLocation() { - QUrl url = QUrl(locationEdit->text()); + QUrl url = QUrl::fromUserInput(locationEdit->text()); view->load(url); view->setFocus(); } -- cgit v1.2.1