mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-03-05 23:26:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

UI: Fix Qt 5.14 deprecation warnings

Browse Source 
These functions should be available on current Qt.
This commit is contained in:
jpark37
2020-01-20 22:13:16 -08:00
parent 500111e230
commit 263bf48baa
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
UI/window-basic-settings.cpp
View File

@@ -898,7 +898,7 @@ void OBSBasicSettings::LoadFormats()
audio ? AUDIO_STR : VIDEO_STR);
ui->advOutFFFormat->addItem(
itemText, qVariantFromValue(formatDesc));
itemText, QVariant::fromValue(formatDesc));
}
format = ff_format_desc_next(format);
@@ -921,7 +921,7 @@ static void AddCodec(QComboBox *combo, const ff_codec_desc *codec_desc)
CodecDesc cd(ff_codec_desc_name(codec_desc),
ff_codec_desc_id(codec_desc));
combo->addItem(itemText, qVariantFromValue(cd));
combo->addItem(itemText, QVariant::fromValue(cd));
}
#define AV_ENCODER_DEFAULT_STR \
@@ -937,7 +937,7 @@ static void AddDefaultCodec(QComboBox *combo, const ff_format_desc *formatDesc,
combo->removeItem(existingIdx);
combo->addItem(QString("%1 (%2)").arg(cd.name, AV_ENCODER_DEFAULT_STR),
qVariantFromValue(cd));
QVariant::fromValue(cd));
}
#define AV_ENCODER_DISABLE_STR \
@@ -984,7 +984,7 @@ void OBSBasicSettings::ReloadCodecs(const ff_format_desc *formatDesc)
ui->advOutFFAEncoder->model()->sort(0);
ui->advOutFFVEncoder->model()->sort(0);
QVariant disable = qVariantFromValue(CodecDesc());
QVariant disable = QVariant::fromValue(CodecDesc());
ui->advOutFFAEncoder->insertItem(0, AV_ENCODER_DISABLE_STR, disable);
ui->advOutFFVEncoder->insertItem(0, AV_ENCODER_DISABLE_STR, disable);