diff options
author | Michael BrĂ¼ning <michael.bruning@digia.com> | 2012-12-06 15:26:40 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-06 16:17:15 +0100 |
commit | 11a7354c9e14ba30dd4504e85ce5c736db3528e0 (patch) | |
tree | 7b15b8e4752c9bf6ed4230b2cc3093979800d0c2 /examples | |
parent | 3d0c382895aa330f395153539969a7f57ce60c71 (diff) | |
download | qtwebkit-examples-11a7354c9e14ba30dd4504e85ce5c736db3528e0.tar.gz |
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 <simon.hausmann@digia.com>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/webkit/fancybrowser/main.cpp | 2 | ||||
-rw-r--r-- | examples/webkit/fancybrowser/mainwindow.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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(); } |