Merge lp:~zeller-benjamin/ubuntu-sdk-ide/snap-trusty-build into lp:ubuntu-sdk-ide

[Benjamin Zeller]

Build on trusty

Build on trusty

[Zoltan Balogh (bzoltan)]

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:170
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/368/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7223/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/368/rebuild

review: Approve (continuous-integration)

=== modified file 'dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snapcraftproject.cpp'
--- dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snapcraftproject.cpp	2016-11-07 11:19:36 +0000
+++ dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snapcraftproject.cpp	2016-11-16 10:24:56 +0000
@@ -67,7 +67,7 @@
     ProjectExplorer::FileNode *projectFileNode = new ProjectExplorer::FileNode(fileName, ProjectExplorer::ProjectFileType, false);
     m_rootNode->addFileNodes({projectFileNode});
 
-    connect(m_file, &SnapcraftProjectFile::changed, this, &SnapcraftProject::asyncUpdate);
+    connect(m_file.data(), &SnapcraftProjectFile::changed, this, &SnapcraftProject::asyncUpdate);
 
     //we show magic directories that are not listed in the snapcraft.yaml file, therefore we need to watch the directory
     //if one of those is changed or removed