qtubuntu

Merge lp://staging/~albaguirre/qtubuntu/papi-cleanup into lp://staging/qtubuntu

  1. papi-cleanup
  2. Merge into trunk
Proposed by Alberto Aguirre
Status: Needs review
Proposed branch: lp://staging/~albaguirre/qtubuntu/papi-cleanup
Merge into: lp://staging/qtubuntu
Prerequisite: lp://staging/~albaguirre/qtubuntu/use-mir-rs-api
Diff against target: 2476 lines (+70/-2204) (has conflicts)
23 files modified
debian/qtubuntu-appmenutheme.install (+0/-1)
debian/rules (+0/-1)
src/src.pro (+1/-1)
src/ubuntuappmenu/com.ubuntu.MenuRegistrar.xml (+0/-83)
src/ubuntuappmenu/gmenumodelexporter.cpp (+0/-475)
src/ubuntuappmenu/gmenumodelexporter.h (+0/-100)
src/ubuntuappmenu/gmenumodelplatformmenu.cpp (+0/-518)
src/ubuntuappmenu/gmenumodelplatformmenu.h (+0/-181)
src/ubuntuappmenu/logging.h (+0/-27)
src/ubuntuappmenu/menuregistrar.cpp (+0/-137)
src/ubuntuappmenu/menuregistrar.h (+0/-59)
src/ubuntuappmenu/qtubuntuextraactionhandler.cpp (+0/-107)
src/ubuntuappmenu/qtubuntuextraactionhandler.h (+0/-40)
src/ubuntuappmenu/registry.cpp (+0/-97)
src/ubuntuappmenu/registry.h (+0/-56)
src/ubuntuappmenu/themeplugin.cpp (+0/-36)
src/ubuntuappmenu/themeplugin.h (+0/-34)
src/ubuntuappmenu/ubuntuappmenu.json (+0/-3)
src/ubuntumirclient/qmirclientintegration.cpp (+69/-99)
src/ubuntumirclient/qmirclientintegration.h (+0/-15)
src/ubuntumirclient/qmirclientplatformservices.cpp (+0/-75)
src/ubuntumirclient/qmirclientplatformservices.h (+0/-57)
src/ubuntumirclient/ubuntumirclient.pro (+0/-2)
Conflict: can't delete src/ubuntuappmenu because it is not empty.  Not deleting.
Conflict because src/ubuntuappmenu is not versioned, but has versioned children.  Versioned directory.
Contents conflict in src/ubuntuappmenu/theme.cpp
Contents conflict in src/ubuntuappmenu/theme.h
Contents conflict in src/ubuntuappmenu/ubuntuappmenu.pro
Text conflict in src/ubuntumirclient/qmirclientintegration.cpp
To merge this branch: bzr merge lp://staging/~albaguirre/qtubuntu/papi-cleanup
Reviewer Review Type Date Requested Status
Michał Sawicz Needs Fixing
Unity8 CI Bot continuous-integration Needs Fixing
Review via email: mp+324886@code.staging.launchpad.net

Commit message

Completely remove dependency on platform-api

Description of the change

The only real use of platform-api was for url launching. Is there something else we can do for that?

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:399
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/225/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4925/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4953/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/225/rebuild

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Michał Sawicz (saviq) wrote :

I suppose whatever the xcb plugin is using for URLs we can use, too (xdg-open?).

LP reports conflicts, can you please update?

review: Needs Fixing
Reply

Unmerged revisions

399. By Alberto Aguirre

Remove platform-api dependency.

398. By Alberto Aguirre

Remove ubuntuappmenu

397. By Alberto Aguirre

Cleanup #pragmas and unneeded repaints when resizing.

396. By Alberto Aguirre

Avoid using mir_window_get_parameters, it will be deprecated

395. By Alberto Aguirre

Remove mir_event_type_key and mir_event_type_motion as they are deprecated.

394. By Alberto Aguirre

Use MirRenderSurface for pixmap cursors.

Creating buffer streams directly will be deprecated in mir in the near future, instead use render surfaces.

393. By Alberto Aguirre

Update resizing now that client can drive the buffer size through mir_render_surface_set_size.

392. By Alberto Aguirre

Avoid use of deprecated mir EGL related apis.

With the new mesa update, the EGLNativeDisplayType is MirConnection and the EGLNativeWindowType is a MirRenderSurface.
Ignore deprecation warnings on use of MirRenderSurface - its "deprecated" because it'll be renamed in mir 1.0.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches