diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-23 11:41:16 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-23 11:41:22 (GMT) |
| commit | d08fc6843e58c63f1c101462bb2e30166a5dbde9 (patch) | |
| tree | 29e68fe1fc72a0931f13d67587b9cfda98e48858 /examples/webkit/framecapture/main.cpp | |
| parent | b4dbbd30c8092a81984cca30248db087353fe66e (diff) | |
| parent | 4112771f56e827d1d8fbde0995ebf5b0242c01a8 (diff) | |
| download | Qt-d08fc6843e58c63f1c101462bb2e30166a5dbde9.zip Qt-d08fc6843e58c63f1c101462bb2e30166a5dbde9.tar.gz Qt-d08fc6843e58c63f1c101462bb2e30166a5dbde9.tar.bz2 | |
Merge 'upstream/4.6' into oslo-staging-2/4.6
Diffstat (limited to 'examples/webkit/framecapture/main.cpp')
| -rw-r--r-- | examples/webkit/framecapture/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/webkit/framecapture/main.cpp b/examples/webkit/framecapture/main.cpp index 050947a..65c0026 100644 --- a/examples/webkit/framecapture/main.cpp +++ b/examples/webkit/framecapture/main.cpp @@ -63,7 +63,7 @@ int main(int argc, char * argv[]) return 0; } - QUrl url = QWebView::guessUrlFromString(QString::fromLatin1(argv[1])); + QUrl url = QUrl::fromUserInput(QString::fromLatin1(argv[1])); QString fileName = QString::fromLatin1(argv[2]); QApplication a(argc, argv); |