lp://staging/~mterry/oxide/mirserver-1.5
Created by
Michael Terry
and last modified
- Get this branch:
- bzr branch lp://staging/~mterry/oxide/mirserver-1.5
Only
Michael Terry
can upload to this branch. If you are
Michael Terry
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Olivier Tilloy (community): Disapprove
- Chris Coulson: Pending requested
-
Diff: 25 lines (+2/-2)2 files modifiedqt/core/browser/oxide_qt_browser_startup.cc (+1/-1)
qt/core/common/oxide_qt_screen_utils.cc (+1/-1)
- Chris Coulson: Pending requested
-
Diff: 1603 lines (+1010/-3) (has conflicts)22 files modifiedCHROMIUM_VERSION (+4/-0)
build/common.gypi (+15/-1)
patches/allow-os-override-for-gpu-manager.patch (+216/-0)
patches/allow-render-widget-compositor-settings-override.patch (+106/-0)
patches/bug1423531.patch (+202/-0)
patches/port/gl_implementation.patch (+49/-1)
patches/series (+7/-0)
patches/support-native-popup-menus.patch (+104/-0)
patches/use-android-style-overlay-scrollbars.patch (+76/-0)
qt/VERSION (+4/-0)
qt/core/browser/oxide_qt_browser_startup.cc (+13/-0)
qt/core/browser/oxide_qt_browser_startup.h (+5/-0)
qt/core/glue/oxide_qt_init.cc (+5/-0)
qt/quick/CMakeLists.txt (+8/-0)
qt/quick/api/oxideqquickwebframe.cc (+19/-0)
qt/quick/api/oxideqquickwebview.cc (+10/-0)
qt/renderer/renderer.gyp (+6/-1)
shared/browser/compositor/oxide_compositor_utils.cc (+107/-0)
shared/browser/oxide_browser_process_main.cc (+8/-0)
shared/browser/oxide_content_browser_client.cc (+15/-0)
shared/browser/oxide_web_frame.cc (+7/-0)
shared/renderer/oxide_content_renderer_client.cc (+24/-0)
Related bugs
Related blueprints
Branch information
Recent revisions
- 969. By Chris Coulson
-
r908 fixed builds with Qt5.4 but broke builds with < Qt5.3. However, this wasn't picked up because those builds were inadvertently fixed again by r949 which unfortunately landed after 1.5 was branched. Backport r949 from trunk, effectively dropping support for < Qt5.2 but fixing the build with Qt5.2 (trusty)
- 968. By Chris Coulson
-
Disable webcore debug symbols and link with --no-keep-
files-mapped on native x86 builds because of linker OOM - 966. By Chris Coulson
-
Backport commit 7431bb2983db683
dcc4556e1918556 254c3d5589 from upstream chromium branch 42 and corresponding unit tests
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/~oxide-developers/oxide/oxide.trunk