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

Proposed by Benjamin Zeller on 2016-07-12
Status: Merged
Approved by: Zoltan Balogh on 2016-07-22
Approved revision: 465
Merged at revision: 461
Proposed branch: lp:~zeller-benjamin/qtcreator-plugin-ubuntu/more-image-info
Merge into: lp:qtcreator-plugin-ubuntu
Diff against target: 54 lines (+9/-4)
3 files modified
src/ubuntu/ubuntuclicktool.cpp (+5/-1)
src/ubuntu/ubuntuclicktool.h (+1/-1)
src/ubuntu/wizards/createtargetwizard.cpp (+3/-2)
To merge this branch: bzr merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/more-image-info
Reviewer Review Type Date Requested Status
Zoltan Balogh (community) 2016-07-12 Approve on 2016-07-22
ubuntu-sdk-build-bot continuous-integration Needs Fixing on 2016-07-12
Review via email: mp+299780@code.launchpad.net

Commit message

Show more informations about the images

Description of the change

Show more informations about the images

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

OK

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ubuntu/ubuntuclicktool.cpp'
2--- src/ubuntu/ubuntuclicktool.cpp 2016-07-06 09:18:16 +0000
3+++ src/ubuntu/ubuntuclicktool.cpp 2016-07-12 08:50:01 +0000
4@@ -267,7 +267,7 @@
5 return in.readAll().trimmed();
6 }
7
8-bool UbuntuClickTool::parseContainerName(const QString &name, UbuntuClickTool::Target *target)
9+bool UbuntuClickTool::parseContainerName(const QString &name, UbuntuClickTool::Target *target, QStringList *allExt)
10 {
11 QStringList ext;
12 target->framework = UbuntuClickFrameworkProvider::getBaseFramework(name, &ext);
13@@ -279,6 +279,10 @@
14 if (ext.isEmpty() || ext.size() != 3)
15 return false;
16 target->architecture = ext[1];
17+
18+ if (allExt)
19+ *allExt = ext;
20+
21 return true;
22 }
23
24
25=== modified file 'src/ubuntu/ubuntuclicktool.h'
26--- src/ubuntu/ubuntuclicktool.h 2016-07-06 09:18:16 +0000
27+++ src/ubuntu/ubuntuclicktool.h 2016-07-12 08:50:01 +0000
28@@ -77,7 +77,7 @@
29 static void openChrootTerminal (const Target& target);
30
31 static QString targetBasePath (const Target& target);
32- static bool parseContainerName (const QString &name, Target *target);
33+ static bool parseContainerName (const QString &name, Target *target, QStringList *allExt = 0);
34 static bool getTargetFromUser (Target* target, const QString &framework=QString());
35 static QStringList getSupportedFrameworks (const Target *target);
36 static QString getMostRecentFramework ( const QString &subFramework, const Target *target );
37
38=== modified file 'src/ubuntu/wizards/createtargetwizard.cpp'
39--- src/ubuntu/wizards/createtargetwizard.cpp 2016-06-14 15:23:46 +0000
40+++ src/ubuntu/wizards/createtargetwizard.cpp 2016-07-12 08:50:01 +0000
41@@ -323,11 +323,12 @@
42 continue;
43
44 UbuntuClickTool::Target target;
45- if (!UbuntuClickTool::parseContainerName(alias, &target))
46+ QStringList extensions;
47+ if (!UbuntuClickTool::parseContainerName(alias, &target, &extensions))
48 continue;
49
50 QTreeWidgetItem *item = new QTreeWidgetItem;
51- item->setText(0,target.framework);
52+ item->setText(0,target.framework+QStringLiteral("-")+extensions.last());
53 item->setData(0, Qt::UserRole, m.value(QStringLiteral("fingerprint"), QStringLiteral("error")));
54 item->setData(0, Qt::UserRole+1, alias);
55

Subscribers

People subscribed via source and target branches