Do not pass platform triplets with '&' when compiling FMUs

OpenModelica · Jan 30, 2019 · de55ec3 · de55ec3
1 parent 0c09579
commit de55ec3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/OMEdit/OMEditGUI/Options/OptionsDialog.cpp b/OMEdit/OMEditGUI/Options/OptionsDialog.cpp
@@ -800,7 +800,7 @@ void OptionsDialog::readFMISettings()
       while (QLayoutItem* pLayoutItem = mpFMIPage->getPlatformsGroupBox()->layout()->itemAt(i)) {
         if (dynamic_cast<QCheckBox*>(pLayoutItem->widget())) {
           QCheckBox *pPlatformCheckBox = dynamic_cast<QCheckBox*>(pLayoutItem->widget());
-          if (pPlatformCheckBox->text().compare(platform) == 0) {
+          if (pPlatformCheckBox->property(Helper::fmuPlatformNamePropertyId).toString().compare(platform) == 0) {
             pPlatformCheckBox->setChecked(true);
             break;
           }
@@ -1299,7 +1299,7 @@ void OptionsDialog::saveFMISettings()
     if (dynamic_cast<QCheckBox*>(pLayoutItem->widget())) {
       QCheckBox *pPlatformCheckBox = dynamic_cast<QCheckBox*>(pLayoutItem->widget());
       if (pPlatformCheckBox->isChecked()) {
-        platforms.append(pPlatformCheckBox->text());
+        platforms.append(pPlatformCheckBox->property(Helper::fmuPlatformNamePropertyId).toString());
       }
     }
     i++;
@@ -4533,7 +4533,10 @@ FMIPage::FMIPage(OptionsDialog *pOptionsDialog)
   pPlatformsLayout->addWidget(pPlatformNoteLabel);
   pPlatformsLayout->addWidget(mpLinkingComboBox);
   foreach (QString compiler, compilers) {
-    pPlatformsLayout->addWidget(new QCheckBox(compiler.left(compiler.lastIndexOf('-'))));
+    QString platformName = compiler.left(compiler.lastIndexOf('-'));
+    QCheckBox *pCheckBox = new QCheckBox(platformName);
+    pCheckBox->setProperty(Helper::fmuPlatformNamePropertyId, platformName);
+    pPlatformsLayout->addWidget(pCheckBox);
   }
   mpPlatformsGroupBox->setLayout(pPlatformsLayout);
   // set the export group box layout

diff --git a/OMEdit/OMEditGUI/Util/Helper.cpp b/OMEdit/OMEditGUI/Util/Helper.cpp
@@ -90,6 +90,7 @@ QString Helper::subWindow = "SubWindow";
 QString Helper::structuredOutput = "Structured";
 QString Helper::textOutput = "Text";
 QString Helper::utf8 = "UTF-8";
+const char * const Helper::fmuPlatformNamePropertyId = "fmu-platform-name";
 QFontInfo Helper::systemFontInfo = QFontInfo(QFont());
 QFontInfo Helper::monospacedFontInfo = QFontInfo(QFont());
 #ifdef Q_OS_MAC

diff --git a/OMEdit/OMEditGUI/Util/Helper.h b/OMEdit/OMEditGUI/Util/Helper.h
@@ -96,6 +96,7 @@ class Helper : public QObject
   static QString structuredOutput;
   static QString textOutput;
   static QString utf8;
+  static const char * const fmuPlatformNamePropertyId;
   static QFontInfo systemFontInfo;
   static QFontInfo monospacedFontInfo;
   static QString toolsOptionsPath;