1
=== modified file 'debian/control'
2
--- debian/control	2016-04-15 11:37:29 +0000
3
+++ debian/control	2016-04-27 16:45:18 +0000
4
@@ -15,6 +15,7 @@
5
15
               liboxideqt-qmlplugin (>= 1.12),
15
               liboxideqt-qmlplugin (>= 1.12),
6
16
               libqt5sql5-sqlite,
16
               libqt5sql5-sqlite,
7
17
               libudev-dev,
17
               libudev-dev,
8
18
               lsb-release,
9
18
               pkg-config,
19
               pkg-config,
10
19
               python3-all,
20
               python3-all,
11
20
               python3-flake8,
21
               python3-flake8,
12
21
22
13
=== modified file 'src/Ubuntu/CMakeLists.txt'
14
--- src/Ubuntu/CMakeLists.txt	2014-05-29 17:03:44 +0000
15
+++ src/Ubuntu/CMakeLists.txt	2016-04-27 16:45:18 +0000
16
@@ -19,5 +19,9 @@
17
19
    set(QT_INSTALL_QML "/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/qml")
19
    set(QT_INSTALL_QML "/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/qml")
18
20
endif()
20
endif()
19
21
21
20
22
execute_process(COMMAND lsb_release --short --release
21
23
    OUTPUT_VARIABLE UBUNTU_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
22
24
add_definitions(-DUBUNTU_VERSION="${UBUNTU_VERSION}")
23
25
24
22
add_subdirectory(Components)
26
add_subdirectory(Components)
25
23
add_subdirectory(Web)
27
add_subdirectory(Web)
26
24
28
27
=== modified file 'src/Ubuntu/Web/UserAgent02.qml'
28
--- src/Ubuntu/Web/UserAgent02.qml	2015-12-10 10:43:04 +0000
29
+++ src/Ubuntu/Web/UserAgent02.qml	2016-04-27 16:45:18 +0000
30
@@ -1,5 +1,5 @@
31
1
/*
1
/*
33
2
 * Copyright 2013-2015 Canonical Ltd.
2
 * Copyright 2013-2016 Canonical Ltd.
34
3
 *
3
 *
35
4
 * This file is part of webbrowser-app.
4
 * This file is part of webbrowser-app.
36
5
 *
5
 *
37
@@ -47,9 +47,6 @@
38
47
    //   difference in the content served by certain sites (e.g. gmail.com)
47
    //   difference in the content served by certain sites (e.g. gmail.com)
39
48
    readonly property string _template: "Mozilla/5.0 (Linux; Ubuntu %1%2%3) AppleWebKit/%4 Chromium/%5 %6Safari/%7%8"
48
    readonly property string _template: "Mozilla/5.0 (Linux; Ubuntu %1%2%3) AppleWebKit/%4 Chromium/%5 %6Safari/%7%8"
40
49
49
41
50
    // FIXME: compute at build time (using lsb_release)
42
51
    readonly property string _ubuntuVersion: "14.04"
43
52
44
53
    readonly property string _attributes: smallScreen ? "like Android 4.4" : ""
50
    readonly property string _attributes: smallScreen ? "like Android 4.4" : ""
45
54
51
46
55
    readonly property string _hardwareID: ""
52
    readonly property string _hardwareID: ""
47
@@ -69,7 +66,7 @@
48
69
66
49
70
    property string defaultUA: {
67
    property string defaultUA: {
50
71
        var ua = _template
68
        var ua = _template
52
72
        ua = ua.arg(_ubuntuVersion) // %1
69
        ua = ua.arg(ubuntuVersion) // %1
53
73
        ua = ua.arg((_attributes !== "") ? " %1".arg(_attributes) : "") // %2
70
        ua = ua.arg((_attributes !== "") ? " %1".arg(_attributes) : "") // %2
54
74
        ua = ua.arg((_hardwareID !== "") ? "; %1".arg(_hardwareID) : "") // %3
71
        ua = ua.arg((_hardwareID !== "") ? "; %1".arg(_hardwareID) : "") // %3
55
75
        ua = ua.arg(_webkitVersion) // %4
72
        ua = ua.arg(_webkitVersion) // %4
56
76
73
57
=== modified file 'src/Ubuntu/Web/plugin.cpp'
58
--- src/Ubuntu/Web/plugin.cpp	2016-02-09 21:56:55 +0000
59
+++ src/Ubuntu/Web/plugin.cpp	2016-04-27 16:45:18 +0000
60
@@ -45,6 +45,7 @@
61
45
    Q_PROPERTY(QString webviewDevtoolsDebugHost READ devtoolsHost CONSTANT)
45
    Q_PROPERTY(QString webviewDevtoolsDebugHost READ devtoolsHost CONSTANT)
62
46
    Q_PROPERTY(int webviewDevtoolsDebugPort READ devtoolsPort CONSTANT)
46
    Q_PROPERTY(int webviewDevtoolsDebugPort READ devtoolsPort CONSTANT)
63
47
    Q_PROPERTY(QStringList webviewHostMappingRules READ hostMappingRules CONSTANT)
47
    Q_PROPERTY(QStringList webviewHostMappingRules READ hostMappingRules CONSTANT)
64
48
    Q_PROPERTY(QString ubuntuVersion READ ubuntuVersion CONSTANT)
65
48
49
66
49
public:
50
public:
67
50
    UbuntuWebPluginContext(QObject* parent = 0);
51
    UbuntuWebPluginContext(QObject* parent = 0);
68
@@ -56,6 +57,7 @@
69
56
    QString devtoolsHost();
57
    QString devtoolsHost();
70
57
    int devtoolsPort();
58
    int devtoolsPort();
71
58
    QStringList hostMappingRules();
59
    QStringList hostMappingRules();
72
60
    QString ubuntuVersion() const;
73
59
61
74
60
Q_SIGNALS:
62
Q_SIGNALS:
75
61
    void cacheLocationChanged() const;
63
    void cacheLocationChanged() const;
76
@@ -205,6 +207,11 @@
77
205
    return m_devtoolsPort;
207
    return m_devtoolsPort;
78
206
}
208
}
79
207
209
80
210
QString UbuntuWebPluginContext::ubuntuVersion() const
81
211
{
82
212
    return QStringLiteral(UBUNTU_VERSION);
83
213
}
84
214
85
208
void UbuntuWebPluginContext::onFocusWindowChanged(QWindow* window)
215
void UbuntuWebPluginContext::onFocusWindowChanged(QWindow* window)
86
209
{
216
{
87
210
    updateScreen();
217
    updateScreen();
Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Needs Fixing on 2016-04-27
Ubuntu Phablet Team		2016-04-27	Pending
Review via email: mp+293132@code.launchpad.net