Merge lp:~abreu-alexandre/ubuntu-html5-theme/port-to-oxide into lp:ubuntu-html5-theme

[Alexandre Abreu]

[lp:~abreu-alexandre/ubuntu-html5-theme/port-to-oxide]

176. By Alexandre Abreu on 2014-11-13

merge lp:~jfmoy/ubuntu-html5-theme/webview-component

177. By Alexandre Abreu on 2014-11-19

Make other files visible to qtc

178. By Alexandre Abreu on 2014-11-19

Fix AP tests; finish port to oxide

179. By Alexandre Abreu on 2014-11-21

strengthn init

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2014-09-22 21:12:32 +0000
+++ debian/control	2014-10-01 13:27:26 +0000
@@ -4,8 +4,7 @@
 Maintainer: Michael Hall <[e-mail]>
 Build-Depends: cmake (>= 2.8.9),
                debhelper (>= 9),
-               libqt5webkit5-dev,
-               qml-module-qtwebkit,
+               liboxideqt-qmlplugin (>= 1.2.0),
                python (>= 2.7),
                python-setuptools,
                qt5-default,
@@ -48,7 +47,7 @@
 Package: ubuntu-html5-ui-toolkit-examples
 Architecture: all
 Depends: libjs-jquery,
-         qml-module-qtwebkit,
+         liboxideqt-qmlplugin (>= 1.2.0),
          qmlscene,
          qtdeclarative5-qtquick2-plugin,
          ubuntu-html5-ui-toolkit (= ${binary:Version}),
@@ -66,7 +65,7 @@
          libautopilot-qt (>= 1.4),
          libjs-jquery,
          libqt5test5,
-         qml-module-qtwebkit,
+         liboxideqt-qmlplugin (>= 1.2.0),
          python-xlib,
          qmlscene,
          qtdeclarative5-qtquick2-plugin,
@@ -84,7 +83,7 @@
 Package: ubuntu-html5-container
 Architecture: any
 Multi-Arch: foreign
-Depends: qml-module-qtwebkit,
+Depends: liboxideqt-qmlplugin (>= 1.2.0),
          qmlscene,
          qtdeclarative5-cordova-2.8-plugin,
          qtdeclarative5-qtquick2-plugin,
@@ -102,7 +101,7 @@
 Architecture: all
 Depends: libautopilot-qt (>= 1.4),
          libqt5test5,
-         qml-module-qtwebkit,
+         liboxideqt-qmlplugin (>= 1.2.0),
          qtdeclarative5-qtquick2-plugin,
          ubuntu-html5-container (>= ${binary:Version}),
          ${misc:Depends},

=== modified file 'tests/autopilot/tools/qml/webview.qml'
--- tests/autopilot/tools/qml/webview.qml	2014-04-03 17:15:24 +0000
+++ tests/autopilot/tools/qml/webview.qml	2014-10-01 13:27:26 +0000
@@ -17,8 +17,7 @@
  */
 
 import QtQuick 2.0
-import QtWebKit 3.0
-import QtWebKit.experimental 1.0
+import com.canonical.Oxide 1.0
 
 Item {
     id: root