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

Proposed by Benjamin Zeller
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 170
Merged at revision: 168
Proposed branch: lp:~zeller-benjamin/ubuntu-sdk-ide/snap-trusty-build
Merge into: lp:ubuntu-sdk-ide
Diff against target: 12 lines (+1/-1)
1 file modified
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snapcraftproject.cpp (+1/-1)
To merge this branch: bzr merge lp:~zeller-benjamin/ubuntu-sdk-ide/snap-trusty-build
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Zoltan Balogh Approve
Review via email:

Commit message

Build on trusty

Description of the change

Build on trusty

To post a comment you must log in.
Revision history for this message
Zoltan Balogh (bzoltan) :
review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snapcraftproject.cpp'
2--- dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snapcraftproject.cpp 2016-11-07 11:19:36 +0000
3+++ dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snapcraftproject.cpp 2016-11-16 10:24:56 +0000
4@@ -67,7 +67,7 @@
5 ProjectExplorer::FileNode *projectFileNode = new ProjectExplorer::FileNode(fileName, ProjectExplorer::ProjectFileType, false);
6 m_rootNode->addFileNodes({projectFileNode});
8- connect(m_file, &SnapcraftProjectFile::changed, this, &SnapcraftProject::asyncUpdate);
9+ connect(, &SnapcraftProjectFile::changed, this, &SnapcraftProject::asyncUpdate);
11 //we show magic directories that are not listed in the snapcraft.yaml file, therefore we need to watch the directory
12 //if one of those is changed or removed


People subscribed via source and target branches