Merge lp:~kdub/qtmir/nochange-rebuild into lp:qtmir

Proposed by Kevin DuBois
Status: Work in progress
Proposed branch: lp:~kdub/qtmir/nochange-rebuild
Merge into: lp:qtmir
Diff against target: 23 lines (+9/-0) (has conflicts)
1 file modified
debian/changelog (+9/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~kdub/qtmir/nochange-rebuild
Reviewer Review Type Date Requested Status
Mir development team Pending
Review via email: mp+277560@code.launchpad.net

Commit message

nochange rebuild for demo silo that fixes mir graphical corruption. do not land.

Description of the change

nochange rebuild for demo silo that fixes mir graphical corruption. do not land.

To post a comment you must log in.
lp:~kdub/qtmir/nochange-rebuild updated
411. By Gerry Boland

Fix use of uninitialized variable
Approved by: Daniel d'Andrada, PS Jenkins bot

412. By Albert Astals Cid

Enable Efficient String Construction by default

See http://blog.qt.io/blog/2011/06/13/string-concatenation-with-qstringbuilder/
Approved by: Gerry Boland, PS Jenkins bot

413. By Michał Sawicz

Build with clang (tests/gmock fails and is unfixable on our side i'd say)
Approved by: Gerry Boland

414. By Gerry Boland

Use pid_t for PIDs.
Approved by: Daniel d'Andrada, PS Jenkins bot

415. By Loïc Molinari

Ensured Mir surface items with size less than or equal to zero are not rendered, as it's usually done for standard QtQuick items.
Approved by: Gerry Boland

416. By Nick Dedekind

Fix a crash when dropping a surface frame before Qt draws a surface item. Fixes: #1517139
Approved by: Gerry Boland

417. By CI Train Bot Account

Releasing 0.4.6+16.04.20151119-0ubuntu1

418. By Daniel d'Andrada

Implemented support for cursors set by client surfaces
Approved by: Lukáš Tinkl

419. By Gerry Boland

Manage frameSwapped signal/slot connection with MirSurface more strictly to avoid crash.

Direct Signal/slot connections across thread boundaries incur the same risks as any cross-thread calls. While connect/disconnect are thread safe methods, it is possible for a slot to be called while the slot owner is being deconstructed - and so not yet disconnected.

So watch for the Item's window change signal and disconnect signal immediately. Also move slot ownership to MirSurfaceItem to auto-disconnect more aggressively.
 Fixes: #1517571
Approved by: Daniel d'Andrada

420. By Daniel d'Andrada

Forward Mir mouse wheel events to the shell cursor Fixes: #1497091
Approved by: Lukáš Tinkl

421. By Daniel d'Andrada

Revert revision 415

The commit "Ensured Mir surface items with size less than or equal to zero are not rendered,
as it's usually done for standard QtQuick items." caused a regression.

MirSurface.size was being kept uninitialized, as QSize(-1,-1).

422. By CI Train Bot Account

Releasing 0.4.6+16.04.20151125-0ubuntu1

423. By Timo Jyrinki

Rebuild against Qt 5.5.1.

424. By Nick Dedekind

Politely asks processes to close before resorting to killing Fixes: #1434584
Approved by: Daniel d'Andrada

425. By Daniel d'Andrada

Add MirSurfaceItem.fillMode and ensure items and buffer are in sync

Ensure that by the time we enter the phase of updating the scene graph, all qml items are up to date regarding the size of the buffer about to be rendered.

NB: This rendering scheme needs triple buffering to work.
Approved by: Michael Zanetti

426. By Daniel d'Andrada

Make Session hold multiple surfaces

+ Standardize MirSurface debug messages and account for multiple surfaces per app
Approved by: Gerry Boland

427. By Michael Terry

Don't hold a wakelock on apps that are exempt from lifecycle management.

This supports the new exemptFromLifecycle flag for applications as well as bringing back the internal RunningInBackground state.

The tests were revived from the same branch that removed them when we removed RunningInBackground (revision 400) Fixes: #1518764

428. By CI Train Bot Account

Releasing 0.4.7+16.04.20151210-0ubuntu1

429. By Cemil Azizoglu

compatibility branch for Mir 0.18
Approved by: Gerry Boland, Michał Sawicz

430. By CI Train Bot Account

Releasing 0.4.7+16.04.20151217-0ubuntu1

431. By Michał Sawicz

No-change rebuild to get -gles in sync
Approved by: Kevin DuBois

432. By CI Train Bot Account

Releasing 0.4.7+16.04.20151222-0ubuntu1

433. By Daniel d'Andrada

Update Session.fullscreen properties at the right time Fixes: #1525893
Approved by: Gerry Boland

434. By CI Train Bot Account

Releasing 0.4.7+16.04.20160104-0ubuntu1

435. By Kevin DuBois

bump changelog for mir rebuild

Unmerged revisions

435. By Kevin DuBois

bump changelog for mir rebuild

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-01-22 16:54:40 +0000
3+++ debian/changelog 2016-01-25 20:04:18 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 qtmir (0.4.7+16.04.20160122-0ubuntu1) xenial; urgency=medium
7
8 [ Nick Dedekind ]
9@@ -6,6 +7,14 @@
10
11 -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 22 Jan 2016 16:54:39 +0000
12
13+=======
14+qtmir (0.4.7+16.04.20160104-0ubuntu2) UNRELEASED; urgency=medium
15+
16+ * No-change rebuild for mir bugfix release.
17+
18+ -- Kevin DuBois <kevin.dubois@canonical.com> Mon, 25 Jan 2016 14:55:24 -0500
19+
20+>>>>>>> MERGE-SOURCE
21 qtmir (0.4.7+16.04.20160104-0ubuntu1) xenial; urgency=medium
22
23 [ Daniel d'Andrada ]

Subscribers

People subscribed via source and target branches