lp:~osomon/oxide/icon

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~oxide-developers/oxide/oxide.trunk at revision 578

Chris Coulson: Approve on 2014-05-30

Diff: 220 lines (+82/-1)

10 files modified

qt/core/browser/oxide_qt_web_view.cc (+4/-0)
qt/core/browser/oxide_qt_web_view.h (+1/-0)
qt/core/glue/oxide_qt_web_view_adapter.h (+1/-0)
qt/quick/api/oxideqquickwebview.cc (+15/-0)
qt/quick/api/oxideqquickwebview_p.h (+4/-0)
qt/quick/api/oxideqquickwebview_p_p.h (+3/-1)
qt/tests/qmltests/api/tst_WebView_icon.html (+5/-0)
qt/tests/qmltests/api/tst_WebView_icon.qml (+32/-0)
shared/browser/oxide_web_view.cc (+13/-0)
shared/browser/oxide_web_view.h (+4/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1259216: Expose an 'icon' property on OxideQQuickWebView

High

Fix Released

Link a bug report

Related blueprints

330. By Olivier Tilloy on 2014-05-28

Updated to chromium API changes.

329. By Olivier Tilloy on 2014-05-28

Merge the latest changes from trunk and resolve a conflict.

328. By Olivier Tilloy on 2014-04-10

Merge the latest changes from trunk and resolve a couple of conflicts.

327. By Olivier Tilloy on 2014-03-31

Re-use empty HTML page.

326. By Olivier Tilloy on 2014-03-31

Merged the latest changes from trunk and resolve conflicts.

325. By Olivier Tilloy on 2014-03-04

Merged the latest changes from trunk and resolve conflicts.

324. By Olivier Tilloy on 2014-02-21

Merged the latest changes from trunk and resolve conflicts.

323. By Olivier Tilloy on 2014-02-10

Merged the latest changes from trunk and resolve conflicts.

322. By Olivier Tilloy on 2014-01-29

Add an 'icon' property to the QML WebView.

321. By Chris Coulson on 2014-01-27

Switch from qmake to cmake, and support cross-compiling with Ubuntu's multi-arch toolchain