Changeset 46267 in webkit

Timestamp:

Jul 23, 2009, 7:31:10 AM (16 years ago)

Author:

Simon Hausmann

Message:

2009-07-23 Laszlo Gombos <Laszlo Gombos>

Reviewed by Simon Hausmann.

[Qt] Add simple proxy support for QtLauncher
​https://bugs.webkit.org/show_bug.cgi?id=27495

Picks up proxy settings from the http_proxy environment
variable.

• QtLauncher/QtLauncher.pro: Add QtNetwork dependency for all platforms.
• QtLauncher/main.cpp: (MainWindow::MainWindow):

Location:

trunk/WebKit/qt

Files:

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

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2009-07-23  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Add simple proxy support for QtLauncher
+        https://bugs.webkit.org/show_bug.cgi?id=27495
+
+        Picks up proxy settings from the http_proxy environment
+        variable.
+
+        * QtLauncher/QtLauncher.pro: Add QtNetwork dependency for all 
+        platforms.
+        * QtLauncher/main.cpp:
+        (MainWindow::MainWindow):
+
 2009-07-23  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/WebKit/qt/QtLauncher/QtLauncher.pro

@@ -7 +7 @@
 include(../../../WebKit.pri)
 
-macx:QT+=xml network
+QT += network
+macx:QT+=xml
 QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR

trunk/WebKit/qt/QtLauncher/main.cpp

@@ -38 +38 @@
 #include <QtGui>
 #include <QDebug>
+#include <QtNetwork/QNetworkProxy>
 #if QT_VERSION >= 0x040400 && !defined(QT_NO_PRINTER)
 #include <QPrintPreviewDialog>
@@ -70 +71 @@
         setCentralWidget(view);
 
-        view->setPage(new WebPage(view));
-
+        WebPage* page = new WebPage(view);
+        view->setPage(page);
+        
         connect(view, SIGNAL(loadFinished(bool)),
                 this, SLOT(loadFinished()));
@@ -81 +83 @@
 
         setupUI();
+
+        // set the proxy to the http_proxy env variable - if present        
+        QUrl proxyUrl = view->guessUrlFromString(qgetenv("http_proxy"));
+        if (proxyUrl.isValid() && !proxyUrl.host().isEmpty()) {
+            int proxyPort = (proxyUrl.port() > 0)  ? proxyUrl.port() : 8080;
+            page->networkAccessManager()->setProxy(QNetworkProxy(QNetworkProxy::HttpProxy, proxyUrl.host(), proxyPort));
+        }
 
         QUrl qurl = view->guessUrlFromString(url);