Commit 06aee5ff authored by Julius Künzel's avatar Julius Künzel 💬
Browse files

[Qt6] Port changed functions

parent 992cf79c
......@@ -1181,8 +1181,13 @@ void Monitor::slotExtractCurrentFrame(QString frameName, bool addToProject)
src.setAutoRemove(false);
m_controller->cloneProducerToFile(src.fileName());
const QStringList pathInfo = {src.fileName(), selectedFile, pCore->bin()->getCurrentFolder()};
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QtConcurrent::run(m_glMonitor->getControllerProxy(), &MonitorProxy::extractFrameToFile, m_glMonitor->getCurrentPos(), pathInfo,
addToProject, useSourceResolution);
#else
QtConcurrent::run(&MonitorProxy::extractFrameToFile, m_glMonitor->getControllerProxy(), m_glMonitor->getCurrentPos(), pathInfo,
addToProject, useSourceResolution);
#endif
} else {
// TODO: warn user, cannot open tmp file
qDebug() << "Could not create temporary file";
......@@ -1258,8 +1263,13 @@ void Monitor::slotExtractCurrentFrame(QString frameName, bool addToProject)
} else {
pathInfo = QStringList({QString(), selectedFile, pCore->bin()->getCurrentFolder()});
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QtConcurrent::run(m_glMonitor->getControllerProxy(), &MonitorProxy::extractFrameToFile, m_glMonitor->getCurrentPos(), pathInfo,
addToProject, useSourceResolution);
#else
QtConcurrent::run(&MonitorProxy::extractFrameToFile, m_glMonitor->getControllerProxy(), m_glMonitor->getCurrentPos(), pathInfo,
addToProject, useSourceResolution);
#endif
}
}
}
......
......@@ -89,7 +89,11 @@ ProviderModel::ProviderModel(const QString &path)
authGroup.writeEntry(QStringLiteral("refresh_token"), refreshToken);
});
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
m_oauth2.setModifyParametersFunction([&](QAbstractOAuth::Stage stage, QVariantMap *parameters) {
#else
m_oauth2.setModifyParametersFunction([&](QAbstractOAuth::Stage stage, QMultiMap<QString, QVariant> *parameters) {
#endif
if (stage == QAbstractOAuth::Stage::RequestingAuthorization) {
if (m_oauth2.scope().isEmpty()) {
parameters->remove("scope");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment