Merge lp://staging/~mterry/oxide/mirserver-1.5 into lp://staging/~oxide-developers/oxide/oxide.trunk
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~mterry/oxide/mirserver-1.5 |
| Merge into: | lp://staging/~oxide-developers/oxide/oxide.trunk |
| Diff against target: |
1603 lines (+1010/-3) (has conflicts) 22 files modified
CHROMIUM_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) Text conflict in CHROMIUM_VERSION Text conflict in build/common.gypi Text conflict in patches/allow-os-override-for-gpu-manager.patch Text conflict in patches/allow-render-widget-compositor-settings-override.patch Text conflict in patches/port/gl_implementation.patch Text conflict in patches/series Text conflict in patches/support-native-popup-menus.patch Text conflict in patches/use-android-style-overlay-scrollbars.patch Text conflict in qt/VERSION Text conflict in qt/core/browser/oxide_qt_browser_startup.cc Text conflict in qt/core/browser/oxide_qt_browser_startup.h Text conflict in qt/core/glue/oxide_qt_init.cc Text conflict in qt/quick/CMakeLists.txt Text conflict in qt/quick/api/oxideqquickwebframe.cc Text conflict in qt/quick/api/oxideqquickwebview.cc Text conflict in qt/renderer/renderer.gyp Text conflict in shared/browser/compositor/oxide_compositor_utils.cc Text conflict in shared/browser/oxide_browser_process_main.cc Text conflict in shared/browser/oxide_content_browser_client.cc Text conflict in shared/browser/oxide_web_frame.cc Text conflict in shared/renderer/oxide_content_renderer_client.cc |
| To merge this branch: | bzr merge lp://staging/~mterry/oxide/mirserver-1.5 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chris Coulson | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2015-04-10.
Commit message
Recognize "mirserver" as a valid ubuntu platform type, and use the GLES2 implementation in that case.
Description of the change
Recognize "mirserver" as a valid ubuntu platform type, and use the GLES2 implementation in that case.
Same fix as https:/
Unmerged revisions
- 974. By Michael Terry
-
Support mirserver as a QPA platform, to fix a crash in the wizard
- 973. By Chris Coulson
-
Automatically bump qt revision to 1.5.7
- 972. By Chris Coulson
-
LP: #1431484
- 971. By Chris Coulson
-
Bump Chromium rev to 41.0.2272.118
- 970. By Chris Coulson
-
Bump Chromium rev to 41.0.2272.89
- 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 - 967. By Chris Coulson
-
Automatically bump qt revision to 1.5.6
- 966. By Chris Coulson
-
Backport commit 7431bb2983db683
dcc4556e1918556 254c3d5589 from upstream chromium branch 42 and corresponding unit tests - 965. By Chris Coulson
-
Backport revisions from trunk to fix the scrollbar styling on mobile
