Merge lp:~dbarth/ubuntu-html5-theme/app-launcher.inspector-support into lp:ubuntu-html5-theme

[David Barth]

add --inspector argument to turn on a web inspector server and debug html5 apps

add --inspector argument to turn on a web inspector server and debug html5 apps.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:107
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2530
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-armhf-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2208
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2532
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2532/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-html5-theme-ci/62/rebuild

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

Looks good to me (how would it not, I originally wrote that code ;)).
You might want to add a comment to state that this code comes from lp:webbrowser-app, in case it changes there, it will be easier to track the changes and import them.

review: Approve

=== modified file 'src/ubuntu-html5-app-launcher/config.h.in'
--- src/ubuntu-html5-app-launcher/config.h.in	2014-01-21 21:44:42 +0000
+++ src/ubuntu-html5-app-launcher/config.h.in	2014-01-22 18:17:46 +0000
@@ -23,6 +23,8 @@
 #include <QtCore/QDir>
 #include <QtCore/QString>
 
+#define REMOTE_INSPECTOR_PORT 9221
+
 namespace Webapp {
 
 namespace Config {

=== modified file 'src/ubuntu-html5-app-launcher/main.cpp'
--- src/ubuntu-html5-app-launcher/main.cpp	2013-12-11 17:01:11 +0000
+++ src/ubuntu-html5-app-launcher/main.cpp	2014-01-22 18:17:46 +0000
@@ -19,6 +19,7 @@
 #include "config.h"
 
 #include <QGuiApplication>
+#include <QtNetwork/QNetworkInterface>
 #include <QtQuick/QQuickItem>
 #include <QtQuick/QQuickView>
 #include <QDebug>
@@ -52,6 +53,7 @@
     const QString MAXIMIZED_ARG_HEADER = "--maximized";
     const QString ARG_HEADER = "--";
     const QString VALUE_HEADER = "=";
+    const QString INSPECTOR = "--inspector";
 
     QHash<QString, QString> properties;
     QString wwwfolder;
@@ -92,6 +94,24 @@
             properties.insert(property, value);
         }
         else
+        if (argument.contains(INSPECTOR))
+        {
+            QString host;
+            Q_FOREACH(QHostAddress address, QNetworkInterface::allAddresses()) {
+                if (!address.isLoopback() && (address.protocol() == QAbstractSocket::IPv4Protocol)) {
+                    host = address.toString();
+                    break;
+                }
+            }
+            QString server;
+            if (host.isEmpty()) {
+                server = QString::number(REMOTE_INSPECTOR_PORT);
+            } else {
+                server = QString("%1:%2").arg(host, QString::number(REMOTE_INSPECTOR_PORT));
+            }
+            qputenv("QTWEBKIT_INSPECTOR_SERVER", server.toUtf8());
+        }
+        else
         {
             qDebug() << "Ignoring argument: " << argument;
         }