Merge lp:~aacid/unity8/thread_warning into lp:unity8

[Albert Astals Cid]

Quit the dash communicator thread before destroying it

Fixes "QThread: Destroyed while thread is still running"

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

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

 * Did you make sure that your branch does not contain spurious tags?
Yes

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

 * If you changed the UI, has there been a design review?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2075
http://jenkins.qa.ubuntu.com/job/unity8-ci/6868/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5550
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/283/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1579
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1474
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1474
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/280
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4346
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5564
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5564/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25718
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/101/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/282
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/282/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25717

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

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
unrelated
 * Did you make sure that the branch does not contain spurious tags?
y

review: Approve

=== modified file 'plugins/Unity/DashCommunicator/dashcommunicator.cpp'
--- plugins/Unity/DashCommunicator/dashcommunicator.cpp	2015-09-14 09:11:08 +0000
+++ plugins/Unity/DashCommunicator/dashcommunicator.cpp	2015-12-02 14:15:07 +0000
@@ -27,6 +27,12 @@
     start();
 }
 
+DashCommunicator::~DashCommunicator()
+{
+    quit();
+    wait();
+}
+
 void DashCommunicator::setCurrentScope(int index, bool animate, bool isSwipe)
 {
     m_mutex.lock();

=== modified file 'plugins/Unity/DashCommunicator/dashcommunicator.h'
--- plugins/Unity/DashCommunicator/dashcommunicator.h	2015-04-29 07:39:58 +0000
+++ plugins/Unity/DashCommunicator/dashcommunicator.h	2015-12-02 14:15:07 +0000
@@ -28,7 +28,7 @@
     Q_OBJECT
 public:
     explicit DashCommunicator(QObject *parent = 0);
-    ~DashCommunicator() = default;
+    ~DashCommunicator();
 
 public Q_SLOTS:
     void setCurrentScope(int index, bool animate, bool isSwipe);