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

Proposed by Benjamin Zeller on 2016-11-16
Status: Merged
Approved by: Zoltan Balogh on 2016-11-16
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 on 2016-11-16
Zoltan Balogh (community) 2016-11-16 Approve on 2016-11-16
Review via email: mp+310990@code.launchpad.net

Commit message

Build on trusty

Description of the change

Build on trusty

To post a comment you must log in.
Zoltan Balogh (bzoltan) :
review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
67 ProjectExplorer::FileNode *projectFileNode = new ProjectExplorer::FileNode(fileName, ProjectExplorer::ProjectFileType, false);67 ProjectExplorer::FileNode *projectFileNode = new ProjectExplorer::FileNode(fileName, ProjectExplorer::ProjectFileType, false);
68 m_rootNode->addFileNodes({projectFileNode});68 m_rootNode->addFileNodes({projectFileNode});
6969
70 connect(m_file, &SnapcraftProjectFile::changed, this, &SnapcraftProject::asyncUpdate);70 connect(m_file.data(), &SnapcraftProjectFile::changed, this, &SnapcraftProject::asyncUpdate);
7171
72 //we show magic directories that are not listed in the snapcraft.yaml file, therefore we need to watch the directory72 //we show magic directories that are not listed in the snapcraft.yaml file, therefore we need to watch the directory
73 //if one of those is changed or removed73 //if one of those is changed or removed

Subscribers

People subscribed via source and target branches