qtubuntu

Merge lp:~gerboland/qtubuntu/select-correct-dialog into lp:qtubuntu

select-correct-dialog
Merge into trunk

Proposed by Gerry Boland on 2017-03-14

Status:	Merged
Approved by:	Daniel d'Andrada on 2017-03-15
Approved revision:	379
Merged at revision:	381
Proposed branch:	lp:~gerboland/qtubuntu/select-correct-dialog
Merge into:	lp:qtubuntu
Diff against target:	22 lines (+8/-3) 1 file modified src/ubuntumirclient/qmirclientwindow.cpp (+8/-3)
To merge this branch:	bzr merge lp:~gerboland/qtubuntu/select-correct-dialog
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Daniel d'Andrada (community)		2017-03-14	Approve on 2017-03-15
Unity8 CI Bot	continuous-integration	2017-03-14	Approve on 2017-03-14
Review via email: mp+319816@code.launchpad.net

This proposal supersedes a proposal from 2017-03-09.

Commit message

Use correct parented/parentless dialog and utility window types from Mir

Fixes crash found in Qt's QWindow tests, where creating a parentless dialog caused an abort as we were trying to create a parented mir (modal) dialog with a null parent.

Description of the change

Twinned upstream change: https://codereview.qt-project.org/#/c/188292/

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-09: Posted in a previous version of this proposal

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

review: Approve (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-14:

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

review: Approve (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2017-03-15:

Look good to me. Also didn't spot any regressions.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Daniel d'Andrada

Gerry Boland

Ubuntu Phablet Team

 === modified file 'src/ubuntumirclient/qmirclientwindow.cpp'
 --- src/ubuntumirclient/qmirclientwindow.cpp	2017-03-08 11:58:41 +0000
 +++ src/ubuntumirclient/qmirclientwindow.cpp	2017-03-14 13:37:17 +0000
@@ -245,10 +245,15 @@
                      &location, mir_edge_attachment_any)};
          break;
      case mir_window_type_dialog:
--        spec = Spec{mir_create_modal_dialog_window_spec(connection, width, height, parent)};
++        if (parent) {
++            spec = Spec{mir_create_modal_dialog_window_spec(connection, width, height, parent)};
++        } else {
++            spec = Spec{mir_create_dialog_window_spec(connection, width, height)};
++        }
          break;
--    case mir_window_type_utility:
--        spec = Spec{mir_create_dialog_window_spec(connection, width, height)};
++    case mir_window_type_utility: // mir missing mir_create_utility_window_spec
++        spec = Spec{mir_create_normal_window_spec(connection, width, height)};
++        mir_window_spec_set_type(spec.get(), mir_window_type_utility);
          break;
      case mir_window_type_tip:
  #if MIR_CLIENT_VERSION < MIR_VERSION_NUMBER(3, 4, 0)