Ubuntu SDK IDE

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

  1. nondesktopsnapcraft
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Benjamin Zeller
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
Benjamin Zeller Approve
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.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Benjamin Zeller (zeller-benjamin) wrote :

LGTM

review: Approve
Revision history for this message
Benjamin Zeller (zeller-benjamin) wrote :

LGTM

review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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

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

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/snapcraftbuildconfigurationfactory.cpp'
--- dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snapcraftbuildconfigurationfactory.cpp 2016-11-07 10:48:52 +0000
+++ dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snapcraftbuildconfigurationfactory.cpp 2016-12-16 11:05:37 +0000
@@ -36,9 +36,10 @@
36 if (qobject_cast<SnapcraftProject *>(parent->project()))36 if (qobject_cast<SnapcraftProject *>(parent->project()))
37 return {};37 return {};
3838
39 //restrict this to local devices type kits for now39 /* FIXME: fully supported only with local device type kits for now
40 if (ProjectExplorer::DeviceKitInformation::deviceId(parent->kit()) != ProjectExplorer::Constants::DESKTOP_DEVICE_ID)40 if (ProjectExplorer::DeviceKitInformation::deviceId(parent->kit()) != ProjectExplorer::Constants::DESKTOP_DEVICE_ID)
41 return {};41 return {};
42 */
4243
43 QList<ProjectExplorer::BuildInfo *> infoList;44 QList<ProjectExplorer::BuildInfo *> infoList;
44 ProjectExplorer::BuildInfo *info = createBuildInfo(parent->kit(), parent->project()->projectFilePath().toString());45 ProjectExplorer::BuildInfo *info = createBuildInfo(parent->kit(), parent->project()->projectFilePath().toString());
@@ -62,9 +63,10 @@
62{63{
63 Utils::MimeDatabase db;64 Utils::MimeDatabase db;
6465
65 //restrict this to local devices type kits for now66 /* FIXME: fully supported only with local device type kits for now
66 if (ProjectExplorer::DeviceKitInformation::deviceId(k) != ProjectExplorer::Constants::DESKTOP_DEVICE_ID)67 if (ProjectExplorer::DeviceKitInformation::deviceId(k) != ProjectExplorer::Constants::DESKTOP_DEVICE_ID)
67 return {};68 return {};
69 */
6870
69 auto mimeType = db.mimeTypeForFile(projectPath);71 auto mimeType = db.mimeTypeForFile(projectPath);
70 if (!mimeType.matchesName(Constants::SNAPCRAFT_PROJECT_MIMETYPE))72 if (!mimeType.matchesName(Constants::SNAPCRAFT_PROJECT_MIMETYPE))

Subscribers

People subscribed via source and target branches

to all changes: