Changeset 51558 in webkit

Timestamp:

Dec 1, 2009 2:05:02 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-01 Daniel Bates <​dbates@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

​https://bugs.webkit.org/show_bug.cgi?id=31898

Makes QtLauncher default to the http scheme for URLs.

• QtLauncher/main.cpp: (MainWindow::MainWindow): (MainWindow::changeLocation): (main):

Location:

trunk/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• QtLauncher/main.cpp (modified) (3 diffs)

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2009-12-01  Daniel Bates  <dbates@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31898
+
+        Makes QtLauncher default to the http scheme for URLs.
+
+        * QtLauncher/main.cpp:
+        (MainWindow::MainWindow):
+        (MainWindow::changeLocation):
+        (main):
+
 2009-11-30  Abhinav Mithal  <abhinav.mithal@nokia.com>
 

trunk/WebKit/qt/QtLauncher/main.cpp

@@ -188 +188 @@
 
         QUrl qurl = urlFromUserInput(url);
+        if (qurl.scheme().isEmpty())
+            qurl = QUrl("http://" + url + "/");
         if (qurl.isValid()) {
             urlEdit->setText(qurl.toEncoded());
             view->load(qurl);
-
         }
 
@@ -213 +214 @@
         QString string = urlEdit->text();
         QUrl url = urlFromUserInput(string);
-        if (!url.isValid())
+        if (url.scheme().isEmpty())
             url = QUrl("http://" + string + "/");
-        urlEdit->setText(url.toEncoded());
-        view->load(url);
-        view->setFocus(Qt::OtherFocusReason);
+        if (url.isValid()) {
+            urlEdit->setText(url.toEncoded());
+            view->load(url);
+            view->setFocus(Qt::OtherFocusReason);
+        }
     }
 
@@ -563 +566 @@
 {
     QApplication app(argc, argv);
-    QString url = QString("%1/%2").arg(QDir::homePath()).arg(QLatin1String("index.html"));
+    QString url = QString("file://%1/%2").arg(QDir::homePath()).arg(QLatin1String("index.html"));
 
     QWebSettings::setMaximumPagesInCache(4);