}
QAction *const action = addAction(QString::fromUtf8(d->name));
- action->setData(qVariantFromValue(l->data));
+ action->setData(QVariant::fromValue(l->data));
mapper_.setMapping(action, action);
connect(action, SIGNAL(triggered()), &mapper_, SLOT(map()));
}
g_slist_free(li);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ connect(&mapper_, SIGNAL(mappedObject(QObject*)), this, SLOT(on_action(QObject*)));
+#else
connect(&mapper_, SIGNAL(mapped(QObject*)), this, SLOT(on_action(QObject*)));
+#endif
}
int DecoderMenu::decoder_name_cmp(const void *a, const void *b)