Merge lp:~dandrader/qtmir/resizeSuspending into lp:qtmir

[Daniel d'Andrada]

Allow resizing an app that is in the process of getting suspended.

Happens when you lock the phone while showing an app in landscape. As
the display turns off, shell rotates itself back to portrait and starts
suspending the app.

* Are there any related MPs required for this MP to build/function as expected? Please list.
No.

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:368
http://jenkins.qa.ubuntu.com/job/qtmir-ci/379/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/112/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/112/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/379/rebuild

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

LGTM. I'm told the merge conflict is LP being confused by the prereq

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-26 13:02:34 +0000
+++ debian/changelog	2015-08-26 13:02:35 +0000
@@ -1,4 +1,9 @@
-<<<<<<< TREE
+qtmir (0.4.6) UNRELEASED; urgency=medium
+
+  * Enable multiple MirSurfaceItems rendering the same MirSurface
+
+ -- Daniel d'Andrada <[e-mail]>  Mon, 27 Jul 2015 13:16:20 -0300
+
 qtmir (0.4.5+15.10.20150817-0ubuntu1) wily; urgency=medium
 
   * 
@@ -6,37 +11,6 @@
  -- CI Train Bot <[e-mail]>  Mon, 17 Aug 2015 19:28:26 +0000
 
 qtmir (0.4.5+15.10.20150812.1-0ubuntu1) vivid; urgency=medium
-=======
-qtmir (0.4.6) UNRELEASED; urgency=medium
-
-  * Enable multiple MirSurfaceItems rendering the same MirSurface
-
- -- Daniel d'Andrada <[e-mail]>  Mon, 27 Jul 2015 13:16:20 -0300
-
-qtmir (0.4.5+15.04.20150821-0ubuntu1) vivid; urgency=medium
-
-  [ Daniel d'Andrada ]
-  * Improve handling of applications that are stopping or getting killed
-    (LP: #1483840, #1485608)
-
-  [ Gerry Boland ]
-  * AppMan: if app destroys surface while in Running state, it is
-    probably shutting down, so preempt it by removing it from the model
-
- -- CI Train Bot <[e-mail]>  Fri, 21 Aug 2015 11:40:14 +0000
-
-qtmir (0.4.5+15.04.20150820-0ubuntu1) vivid; urgency=medium
-
-  [ Gerry Boland ]
-  * Hotfix to work around bug 1483752 (LP: #1483752)
-
-  [ Michael Zanetti ]
-  * Hotfix to work around bug 1483752 (LP: #1483752)
-
- -- CI Train Bot <[e-mail]>  Thu, 20 Aug 2015 12:59:54 +0000
-
-qtmir (0.4.5+15.04.20150812.1-0ubuntu1) vivid; urgency=medium
->>>>>>> MERGE-SOURCE
 
   [ Daniel van Vugt ]
   * MirSurfaceItem: Remove an unnecessary and potentially infinite loop

=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
--- src/modules/Unity/Application/mirsurface.cpp	2015-08-26 13:02:34 +0000
+++ src/modules/Unity/Application/mirsurface.cpp	2015-08-26 13:02:35 +0000
@@ -587,7 +587,8 @@
 {
     return (m_session &&
             (m_session->state() == Session::State::Running
-             || m_session->state() == Session::State::Starting))
+             || m_session->state() == Session::State::Starting
+             || m_session->state() == Session::State::Suspending))
         || !m_session;
 }