Prep for Nightly (#4089)

* Prep for Nightly

* Compile fix

* Much nicer :)

* One more

* Fix

* Last one

* Cosmetics
This commit is contained in:
3djc
2016-12-03 09:36:51 +01:00
committed by Bertrand Songis
parent 862ff2f80d
commit 35e199b579
7 changed files with 35 additions and 22 deletions
+3 -3
View File
@@ -45,7 +45,7 @@
#endif
#ifdef __APPLE__
#include <QProxyStyle>
#include <QProxyStyle>
class MyProxyStyle : public QProxyStyle
{
@@ -162,7 +162,7 @@ int main(int argc, char *argv[])
}
}
if (!ok) {
firmwareId = QInputDialog::getItem(0, QObject::tr("Radio type"),
firmwareId = QInputDialog::getItem(0, QObject::tr("Radio type"),
QObject::tr("Which radio type do you want to simulate?"),
firmwareIds, currentIdx, false, &ok);
}
@@ -200,7 +200,7 @@ int main(int argc, char *argv[])
showMessage(QObject::tr("ERROR: Simulator %1 not found").arg(firmwareId), QMessageBox::Critical);
return 2;
}
if (factory->type() == BOARD_HORUS)
if (factory->type() == BOARD_HORUS && HORUS_READY_FOR_RELEASE())
dialog = new SimulatorDialogHorus(NULL, factory->create());
else if (factory->type() == BOARD_FLAMENCO)
dialog = new SimulatorDialogFlamenco(NULL, factory->create());