[Merge] lp:~aacid/kubuntu-packaging/qtbase-opensource-src into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

[Albert Astals Cid]

Albert Astals Cid has proposed merging lp:~aacid/kubuntu-packaging/qtbase-opensource-src into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

Commit message:
Fix crash on dbus shutdown

Already accepted upstream at https://codereview.qt-project.org/#/c/86825/

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)
Related bugs:
  Bug #1332598 in Unity 8: "make testShell crashes"
  https://bugs.launchpad.net/unity8/+bug/1332598

For more details, see:
https://code.launchpad.net/~aacid/kubuntu-packaging/qtbase-opensource-src/+merge/225133
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~aacid/kubuntu-packaging/qtbase-opensource-src/+merge/225133
Your team Kubuntu Packagers is requested to review the proposed merge of lp:~aacid/kubuntu-packaging/qtbase-opensource-src into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 524288 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kubuntu-devel/attachments/20140701/917c26ce/attachment-0001.diff>