Merge lp:~abreu-alexandre/ubuntu-html5-theme/remove-qtwebkit into lp:ubuntu-html5-theme

[David Barth]

Remove QtWebkit support code

Remove QtWebkit support code

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:201
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/169/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/751
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-vivid-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-vivid-armhf-ci/14
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/606
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/890
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/890/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

Please revert the change to debian/changelog.

In src/plugin/Ubuntu/WebApps/WebAppContainer.qml, at line 42, this can be removed:

    property bool oxide: true

NOTE: all 9 autopilot tests of the ubuntu_html5_ui_toolkit test suite are failing on my desktop (lp:ubuntu-html5-theme), so I’m not able to validate that this branch doesn’t introduce regressions.

review: Needs Fixing

[Alexandre Abreu (abreu-alexandre)]

updated,

NOTE: I have 3 AP test for the UI that are failing, I'll address this in a separate MR,

[lp:~abreu-alexandre/ubuntu-html5-theme/remove-qtwebkit]

202. By Alexandre Abreu on 2015-03-30

updates

[Olivier Tilloy (osomon)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:202
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/172/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/764
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-vivid-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-vivid-armhf-ci/17
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/614
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/907
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/907/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2015-01-21 16:41:33 +0000
+++ debian/control	2015-03-30 17:39:48 +0000
@@ -82,7 +82,6 @@
 Architecture: any
 Multi-Arch: foreign
 Depends: liboxideqt-qmlplugin (>= 1.3.5),
-         qml-module-qtwebkit,
          qmlscene,
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-ubuntu-ui-extras-browser-plugin,

=== modified file 'examples/html5-theme/ui-gallery/qml/main.qml'
--- examples/html5-theme/ui-gallery/qml/main.qml	2014-01-27 18:42:31 +0000
+++ examples/html5-theme/ui-gallery/qml/main.qml	2015-03-30 17:39:48 +0000
@@ -20,7 +20,7 @@
  */
 
 import QtQuick 2.0
-import QtWebKit 3.0
+import com.canonical.Oxide 1.0
 
 Item {
      width: 800

=== modified file 'src/plugin/Ubuntu/WebApps/WebAppContainer.qml'
--- src/plugin/Ubuntu/WebApps/WebAppContainer.qml	2014-12-16 21:02:55 +0000
+++ src/plugin/Ubuntu/WebApps/WebAppContainer.qml	2015-03-30 17:39:48 +0000
@@ -37,12 +37,6 @@
 
     /*!
       \preliminary
-      The property defines if oxide is to be used as the webengine backend.
-      */
-    property bool oxide: true
-
-    /*!
-      \preliminary
       The property holds the path to the filesystem location where the 'index.html'
       file can be found (root of the HTML5 application).
 

=== modified file 'src/ubuntu-html5-app-launcher/main.cpp'
--- src/ubuntu-html5-app-launcher/main.cpp	2014-12-16 21:02:55 +0000
+++ src/ubuntu-html5-app-launcher/main.cpp	2015-03-30 17:39:48 +0000
@@ -219,10 +219,6 @@
     engine->rootContext()->setContextProperty("inspector", remoteInspectorEnabled);
     engine->rootContext()->setContextProperty("wwwFolder", wwwFolder.absoluteFilePath());
 
-    if (remoteInspectorEnabled) {
-        qputenv("QTWEBKIT_INSPECTOR_SERVER", remoteInspectorPort.toUtf8());
-    }
-
     view.setSource(QUrl::fromLocalFile(Webapp::Config::getContainerMainQmlPath()
                                           + "/main.qml"));
     if (view.status() != QQuickView::Ready)