Merge lp://qastaging/~osomon/oxide/text-selection-colors into lp://qastaging/~oxide-developers/oxide/oxide.trunk
Proposed by
Olivier Tilloy
Status: | Rejected |
---|---|
Rejected by: | Olivier Tilloy |
Proposed branch: | lp://qastaging/~osomon/oxide/text-selection-colors |
Merge into: | lp://qastaging/~oxide-developers/oxide/oxide.trunk |
Diff against target: |
933 lines (+557/-23) 13 files modified
qt/core/browser/oxide_qt_web_context.cc (+112/-2) qt/core/browser/oxide_qt_web_context.h (+8/-1) qt/core/glue/oxide_qt_web_context_proxy.h (+13/-0) qt/qmlplugin/oxide.qmltypes (+30/-14) qt/qmlplugin/oxide_qml_plugin.cc (+3/-1) qt/quick/api/oxideqquickwebcontext.cc (+73/-1) qt/quick/api/oxideqquickwebcontext.h (+23/-1) qt/tests/qmltests/api/tst_WebContext_selectionColors.qml (+110/-0) shared/browser/oxide_browser_context.cc (+122/-2) shared/browser/oxide_browser_context.h (+18/-0) shared/browser/oxide_browser_context_observer.h (+3/-1) shared/browser/oxide_web_view_contents_helper.cc (+39/-0) shared/browser/oxide_web_view_contents_helper.h (+3/-0) |
To merge this branch: | bzr merge lp://qastaging/~osomon/oxide/text-selection-colors |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Olivier Tilloy (community) | Disapprove | ||
Chris Coulson | Pending | ||
Review via email:
|
Commit message
Expose the text selection colors (active/inactive background/
To post a comment you must log in.
Unmerged revisions
- 1283. By Olivier Tilloy
-
Bump version to 1.14 and re-generate qmltypes file.
- 1282. By Olivier Tilloy
-
Merge the latest changes from trunk and resolve a few conflicts.
- 1281. By Olivier Tilloy
-
Add unit tests for the selection colors.
- 1280. By Olivier Tilloy
-
Bump version to 1.12.
- 1279. By Olivier Tilloy
-
Expose the text selection colors (active/inactive background/
foreground) to the embedder, through the WebContext.
Superseded by https:/ /code.launchpad .net/~osomon/ oxide/hardcoded -selection- colors/ +merge/ 287015.