Ubuntu Seeds

Merge lp:~timo-jyrinki/ubuntu-seeds/touch_vivid_remove_qtwebkit into lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.vivid

  1. touch_vivid_remove_qtwebkit
  2. Merge into ubuntu-touch.vivid
Proposed by Timo Jyrinki
Status: Merged
Merged at revision: 285
Proposed branch: lp:~timo-jyrinki/ubuntu-seeds/touch_vivid_remove_qtwebkit
Merge into: lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.vivid
Diff against target: 24 lines (+1/-2)
2 files modified
sdk-libs (+1/-1)
sdk-libs-dev (+0/-1)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu-seeds/touch_vivid_remove_qtwebkit
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+252870@code.launchpad.net

Commit message

Remove qtwebkit from sdk-libs, since only Oxide is wanted on images (LP: #1362640)

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Merged and uploaded.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sdk-libs'
2--- sdk-libs 2015-03-09 14:36:36 +0000
3+++ sdk-libs 2015-03-13 10:13:23 +0000
4@@ -13,7 +13,7 @@
5 * libqt5keychain0
6 * qml-module-qtgraphicaleffects
7 * libqt5sql5-sqlite
8- * qml-module-qtwebkit
9+ * liboxideqt-qmlplugin
10 * qml-module-qt-websockets
11 * libqt5script5
12 * libqt5multimedia5-plugins
13
14=== modified file 'sdk-libs-dev'
15--- sdk-libs-dev 2015-03-09 14:36:36 +0000
16+++ sdk-libs-dev 2015-03-13 10:13:23 +0000
17@@ -10,7 +10,6 @@
18
19 * libqt5sensors5-dev
20 * libqt5svg5-dev
21- * libqt5webkit5-dev
22 * libqt5websockets5-dev
23 * libqt5xmlpatterns5-dev
24 * qt3d5-dev

Subscribers

People subscribed via source and target branches