Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/more-image-info into lp:qtcreator-plugin-ubuntu

[Benjamin Zeller]

Show more informations about the images

Show more informations about the images

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:465
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/48/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4353/console

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

review: Needs Fixing (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

=== modified file 'src/ubuntu/ubuntuclicktool.cpp'
--- src/ubuntu/ubuntuclicktool.cpp	2016-07-06 09:18:16 +0000
+++ src/ubuntu/ubuntuclicktool.cpp	2016-07-12 08:50:01 +0000
@@ -267,7 +267,7 @@
     return in.readAll().trimmed();
 }
 
-bool UbuntuClickTool::parseContainerName(const QString &name, UbuntuClickTool::Target *target)
+bool UbuntuClickTool::parseContainerName(const QString &name, UbuntuClickTool::Target *target, QStringList *allExt)
 {
     QStringList ext;
     target->framework = UbuntuClickFrameworkProvider::getBaseFramework(name, &ext);
@@ -279,6 +279,10 @@
     if (ext.isEmpty() || ext.size() != 3)
         return false;
     target->architecture = ext[1];
+
+    if (allExt)
+        *allExt = ext;
+
     return true;
 }
 
 
=== modified file 'src/ubuntu/ubuntuclicktool.h'
--- src/ubuntu/ubuntuclicktool.h	2016-07-06 09:18:16 +0000
+++ src/ubuntu/ubuntuclicktool.h	2016-07-12 08:50:01 +0000
@@ -77,7 +77,7 @@
     static void openChrootTerminal (const Target& target);
 
     static QString targetBasePath (const Target& target);
-    static bool parseContainerName (const QString &name, Target *target);
+    static bool parseContainerName (const QString &name, Target *target, QStringList *allExt = 0);
     static bool getTargetFromUser (Target* target, const QString &framework=QString());
     static QStringList getSupportedFrameworks (const Target *target);
     static QString getMostRecentFramework ( const QString &subFramework, const Target *target );
 
=== modified file 'src/ubuntu/wizards/createtargetwizard.cpp'
--- src/ubuntu/wizards/createtargetwizard.cpp	2016-06-14 15:23:46 +0000
+++ src/ubuntu/wizards/createtargetwizard.cpp	2016-07-12 08:50:01 +0000
@@ -323,11 +323,12 @@
             continue;
 
         UbuntuClickTool::Target target;
-        if (!UbuntuClickTool::parseContainerName(alias, &target))
+        QStringList extensions;
+        if (!UbuntuClickTool::parseContainerName(alias, &target, &extensions))
             continue;
 
         QTreeWidgetItem *item = new QTreeWidgetItem;
-        item->setText(0,target.framework);
+        item->setText(0,target.framework+QStringLiteral("-")+extensions.last());
         item->setData(0, Qt::UserRole, m.value(QStringLiteral("fingerprint"), QStringLiteral("error")));
         item->setData(0, Qt::UserRole+1, alias);