ubuntu-sdk-team team mailing list archive

[Christian Dywan <christian@xxxxxxxxxxxx>]

Christian Dywan has proposed merging lp:~kalikiana/ubuntu-sdk-ide/nondesktopsnapcraft into lp:ubuntu-sdk-ide.

Commit message:
Allow non-local kits for Snapcraft projects

Requested reviews:
  Ubuntu SDK team (ubuntu-sdk-team)

For more details, see:
https://code.launchpad.net/~kalikiana/ubuntu-sdk-ide/nondesktopsnapcraft/+merge/313426
-- 
Your team Ubuntu SDK team is requested to review the proposed merge of lp:~kalikiana/ubuntu-sdk-ide/nondesktopsnapcraft into lp:ubuntu-sdk-ide.

=== 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 @@
     if (qobject_cast<SnapcraftProject *>(parent->project()))
         return {};
 
-    //restrict this to local devices type kits for now
+    /* FIXME: fully supported only with local device type kits for now
     if (ProjectExplorer::DeviceKitInformation::deviceId(parent->kit()) != ProjectExplorer::Constants::DESKTOP_DEVICE_ID)
         return {};
+    */
 
     QList<ProjectExplorer::BuildInfo *> infoList;
     ProjectExplorer::BuildInfo *info = createBuildInfo(parent->kit(), parent->project()->projectFilePath().toString());
@@ -62,9 +63,10 @@
 {
     Utils::MimeDatabase db;
 
-    //restrict this to local devices type kits for now
+    /* FIXME: fully supported only with local device type kits for now
     if (ProjectExplorer::DeviceKitInformation::deviceId(k) != ProjectExplorer::Constants::DESKTOP_DEVICE_ID)
         return {};
+    */
 
     auto mimeType = db.mimeTypeForFile(projectPath);
     if (!mimeType.matchesName(Constants::SNAPCRAFT_PROJECT_MIMETYPE))