Merge lp:~kalikiana/ubuntu-sdk-ide/nondesktopsnapcraft into lp:ubuntu-sdk-ide

Proposed by Christian Dywan on 2016-12-16
Status: Merged
Approved by: Benjamin Zeller on 2016-12-16
Approved revision: 169
Merged at revision: 169
Proposed branch: lp:~kalikiana/ubuntu-sdk-ide/nondesktopsnapcraft
Merge into: lp:ubuntu-sdk-ide
Diff against target: 27 lines (+4/-2)
1 file modified
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snapcraftbuildconfigurationfactory.cpp (+4/-2)
To merge this branch: bzr merge lp:~kalikiana/ubuntu-sdk-ide/nondesktopsnapcraft
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve on 2016-12-16
Benjamin Zeller (community) 2016-12-16 Approve on 2016-12-16
Review via email: mp+313426@code.launchpad.net

Commit message

Allow non-local kits for Snapcraft projects

To post a comment you must log in.
review: Approve (continuous-integration)
Benjamin Zeller (zeller-benjamin) wrote :

LGTM

review: Approve
Benjamin Zeller (zeller-benjamin) wrote :

LGTM

review: Approve
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/snapcraftbuildconfigurationfactory.cpp'
2--- dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snapcraftbuildconfigurationfactory.cpp 2016-11-07 10:48:52 +0000
3+++ dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snapcraftbuildconfigurationfactory.cpp 2016-12-16 11:05:37 +0000
4@@ -36,9 +36,10 @@
5 if (qobject_cast<SnapcraftProject *>(parent->project()))
6 return {};
7
8- //restrict this to local devices type kits for now
9+ /* FIXME: fully supported only with local device type kits for now
10 if (ProjectExplorer::DeviceKitInformation::deviceId(parent->kit()) != ProjectExplorer::Constants::DESKTOP_DEVICE_ID)
11 return {};
12+ */
13
14 QList<ProjectExplorer::BuildInfo *> infoList;
15 ProjectExplorer::BuildInfo *info = createBuildInfo(parent->kit(), parent->project()->projectFilePath().toString());
16@@ -62,9 +63,10 @@
17 {
18 Utils::MimeDatabase db;
19
20- //restrict this to local devices type kits for now
21+ /* FIXME: fully supported only with local device type kits for now
22 if (ProjectExplorer::DeviceKitInformation::deviceId(k) != ProjectExplorer::Constants::DESKTOP_DEVICE_ID)
23 return {};
24+ */
25
26 auto mimeType = db.mimeTypeForFile(projectPath);
27 if (!mimeType.matchesName(Constants::SNAPCRAFT_PROJECT_MIMETYPE))

Subscribers

People subscribed via source and target branches