1
=== modified file 'src/Ubuntu/Web/UbuntuWebContext.qml'
2
--- src/Ubuntu/Web/UbuntuWebContext.qml	2014-08-11 15:13:50 +0000
3
+++ src/Ubuntu/Web/UbuntuWebContext.qml	2014-10-06 14:12:36 +0000
4
@@ -82,4 +82,5 @@
5
82
82
6
83
    devtoolsEnabled: webviewDevtoolsDebugPort !== -1
83
    devtoolsEnabled: webviewDevtoolsDebugPort !== -1
7
84
    devtoolsPort: webviewDevtoolsDebugPort
84
    devtoolsPort: webviewDevtoolsDebugPort
8
85
    devtoolsIp: webviewDevtoolsDebugHost
9
85
}
86
}
10
86
87
11
=== modified file 'src/Ubuntu/Web/plugin.cpp'
12
--- src/Ubuntu/Web/plugin.cpp	2014-09-26 13:30:46 +0000
13
+++ src/Ubuntu/Web/plugin.cpp	2014-10-06 14:12:36 +0000
14
@@ -83,6 +83,18 @@
15
83
    return port > 0 ? port : DEVTOOLS_INVALID_PORT;
83
    return port > 0 ? port : DEVTOOLS_INVALID_PORT;
16
84
}
84
}
17
85
85
18
86
19
87
static QString getDevtoolsHost()
20
88
{
21
89
    QString host;
22
90
    const char* DEVTOOLS_HOST_ENV_VAR = "UBUNTU_WEBVIEW_DEVTOOLS_HOST";
23
91
24
92
    if (qEnvironmentVariableIsSet(DEVTOOLS_HOST_ENV_VAR)) {
25
93
        host = qgetenv(DEVTOOLS_HOST_ENV_VAR);
26
94
    }
27
95
    return host;
28
96
}
29
97
30
86
void UbuntuBrowserPlugin::initializeEngine(QQmlEngine* engine, const char* uri)
98
void UbuntuBrowserPlugin::initializeEngine(QQmlEngine* engine, const char* uri)
31
87
{
99
{
32
88
    Q_UNUSED(uri);
100
    Q_UNUSED(uri);
33
@@ -102,6 +114,7 @@
34
102
114
35
103
    context->setContextProperty("formFactor", getFormFactor());
115
    context->setContextProperty("formFactor", getFormFactor());
36
104
    context->setContextProperty("webviewDevtoolsDebugPort", getDevtoolsPort());
116
    context->setContextProperty("webviewDevtoolsDebugPort", getDevtoolsPort());
37
117
    context->setContextProperty("webviewDevtoolsDebugHost", getDevtoolsHost());
38
105
118
39
106
    engine->addImageProvider("favicon", new FaviconImageProvider());
119
    engine->addImageProvider("favicon", new FaviconImageProvider());
40
107
}
120
}
41
108
121
42
=== modified file 'src/app/browserapplication.cpp'
43
--- src/app/browserapplication.cpp	2014-09-15 17:08:41 +0000
44
+++ src/app/browserapplication.cpp	2014-10-06 14:12:36 +0000
45
@@ -77,6 +77,18 @@
46
77
    return port;
77
    return port;
47
78
}
78
}
48
79
79
49
80
QString BrowserApplication::inspectorHost() const
50
81
{
51
82
    QString host;
52
83
    Q_FOREACH(QHostAddress address, QNetworkInterface::allAddresses()) {
53
84
        if (!address.isLoopback() && (address.protocol() == QAbstractSocket::IPv4Protocol)) {
54
85
            host = address.toString();
55
86
            break;
56
87
        }
57
88
    }
58
89
    return host;
59
90
}
60
91
61
80
QString BrowserApplication::appId() const
92
QString BrowserApplication::appId() const
62
81
{
93
{
63
82
    Q_FOREACH(const QString& argument, m_arguments) {
94
    Q_FOREACH(const QString& argument, m_arguments) {
64
@@ -123,8 +135,10 @@
65
123
#endif
135
#endif
66
124
136
67
125
    QString devtoolsPort = inspectorPort();
137
    QString devtoolsPort = inspectorPort();
68
138
    QString devtoolsHost = inspectorHost();
69
126
    bool inspectorEnabled = !devtoolsPort.isEmpty();
139
    bool inspectorEnabled = !devtoolsPort.isEmpty();
70
127
    if (inspectorEnabled) {
140
    if (inspectorEnabled) {
71
141
        qputenv("UBUNTU_WEBVIEW_DEVTOOLS_HOST", devtoolsHost.toUtf8());
72
128
        qputenv("UBUNTU_WEBVIEW_DEVTOOLS_PORT", devtoolsPort.toUtf8());
142
        qputenv("UBUNTU_WEBVIEW_DEVTOOLS_PORT", devtoolsPort.toUtf8());
73
129
    }
143
    }
74
130
144
75
131
145
76
=== modified file 'src/app/browserapplication.h'
77
--- src/app/browserapplication.h	2014-07-03 19:49:54 +0000
78
+++ src/app/browserapplication.h	2014-10-06 14:12:36 +0000
79
@@ -59,6 +59,7 @@
80
59
private:
59
private:
81
60
    QString appId() const;
60
    QString appId() const;
82
61
    QString inspectorPort() const;
61
    QString inspectorPort() const;
83
62
    QString inspectorHost() const;
84
62
63
85
63
    WebBrowserWindow *m_webbrowserWindowProxy;
64
    WebBrowserWindow *m_webbrowserWindowProxy;
86
64
};
65
};
Reviewer	Review Type	Date Requested	Status
Olivier Tilloy		2014-10-02	Approve on 2014-10-06
PS Jenkins bot	continuous-integration		Approve on 2014-10-02
Review via email: mp+236965@code.launchpad.net