Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
swirl 2022-02-17 15:47:43 -05:00
commit 7b4b997a34
No known key found for this signature in database
GPG Key ID: 46507311CD292A08

View File

@ -588,7 +588,7 @@ public:
actionExportInstance = TranslatedAction(MainWindow); actionExportInstance = TranslatedAction(MainWindow);
actionExportInstance->setObjectName(QStringLiteral("actionExportInstance")); actionExportInstance->setObjectName(QStringLiteral("actionExportInstance"));
actionExportInstance.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Export Instance")); actionExportInstance.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Export Instance"));
// FIXME: missing tooltip actionExportInstance.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Export the selected instance as a zip file."));
all_actions.append(&actionExportInstance); all_actions.append(&actionExportInstance);
instanceToolBar->addAction(actionExportInstance); instanceToolBar->addAction(actionExportInstance);