From 08e44cd7228eae487d744849de17bdd459559197 Mon Sep 17 00:00:00 2001
From: Bernd Wachter <bernd.wachter@jollamobile.com>
Date: Fri, 5 Apr 2013 15:19:32 +0300
Subject: [PATCH] Allow list of variable sections; allow variable sections in
 model definition

---
 libssu/ssudeviceinfo.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/libssu/ssudeviceinfo.cpp b/libssu/ssudeviceinfo.cpp
index 95ffc1a..11f0d67 100644
--- a/libssu/ssudeviceinfo.cpp
+++ b/libssu/ssudeviceinfo.cpp
@@ -60,7 +60,17 @@ QString SsuDeviceInfo::adaptationVariables(const QString &adaptationName, QHash<
       storageHash->insert("adaptation", adaptationRepo);
       ssuLog->print(LOG_DEBUG, "Found first adaptation " + adaptationName);
 
+      QString model = deviceVariant(true);
       QHash<QString, QString> h;
+
+      // add global variables for this model
+      if (boardMappings->contains(model + "/variables")){
+        QStringList sections = boardMappings->value(model + "/variables").toStringList();
+        foreach(const QString &section, sections)
+          variableSection(section, &h);
+      }
+
+      // override with variables specific to this repository
       variableSection(adaptationRepo, &h);
 
       QHash<QString, QString>::const_iterator i = h.constBegin();
@@ -269,7 +279,9 @@ void SsuDeviceInfo::variableSection(QString section, QHash<QString, QString> *st
     section = "var-" + section;
 
   if (boardMappings->contains(section + "/variables")){
-    variableSection(boardMappings->value(section + "/variables").toString(), storageHash);
+    QStringList sections = boardMappings->value(section + "/variables").toStringList();
+    foreach(const QString &section, sections)
+      variableSection(section, storageHash);
     return;
   }