Ubuntu Seeds

Merge lp:~bzoltan/ubuntu-seeds/add_QtWebSocket into lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.vivid

  1. add_QtWebSocket
  2. Merge into ubuntu-touch.vivid
Proposed by Zoltan Balogh on 2015-03-09
Status: Merged
Merged at revision: 283
Proposed branch: lp:~bzoltan/ubuntu-seeds/add_QtWebSocket
Merge into: lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.vivid
Diff against target: 23 lines (+2/-0)
2 files modified
sdk-libs (+1/-0)
sdk-libs-dev (+1/-0)
To merge this branch: bzr merge lp:~bzoltan/ubuntu-seeds/add_QtWebSocket
Reviewer Review Type Date Requested Status
Timo Jyrinki Approve on 2015-03-12
Ubuntu Core Development Team 2015-03-09 Pending
Review via email: mp+252303@code.launchpad.net

Commit Message

Add QtWebSocket to the SDK and to the framework

http://pastebin.ubuntu.com/10568583/

Description of the Change

Add QtWebSocket to the SDK and to the framework

http://pastebin.ubuntu.com/10568583/

To post a comment you must log in.
Timo Jyrinki (timo-jyrinki) wrote :

This is ok, requested by app developers. The module is supported by Qt upstream.

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-01-28 15:19:28 +0000
3+++ sdk-libs 2015-03-09 14:38:13 +0000
4@@ -14,6 +14,7 @@
5 * qml-module-qtgraphicaleffects
6 * libqt5sql5-sqlite
7 * qml-module-qtwebkit
8+ * qml-module-qt-websockets
9 * libqt5script5
10 * libqt5multimedia5-plugins
11 * qtdeclarative5-u1db1.0
12
13=== modified file 'sdk-libs-dev'
14--- sdk-libs-dev 2015-01-29 07:54:40 +0000
15+++ sdk-libs-dev 2015-03-09 14:38:13 +0000
16@@ -11,6 +11,7 @@
17 * libqt5sensors5-dev
18 * libqt5svg5-dev
19 * libqt5webkit5-dev
20+ * libqt5websockets5-dev
21 * libqt5xmlpatterns5-dev
22 * qt3d5-dev
23 * qtbase5-dev

Subscribers

People subscribed via source and target branches