mirror of https://github.com/RPCS3/rpcs3
Fix compilation with older Qt versions
This commit is contained in:
parent
711ec69e48
commit
16e41f4492
|
|
@ -870,7 +870,7 @@ bool main_window::InstallPackages(QStringList file_paths, bool from_boot)
|
||||||
|
|
||||||
const QString installation_info =
|
const QString installation_info =
|
||||||
tr("Installation path: %0\nAvailable disk space: %1%2\nRequired disk space: %3")
|
tr("Installation path: %0\nAvailable disk space: %1%2\nRequired disk space: %3")
|
||||||
.arg(rpcs3::utils::get_hdd0_game_dir())
|
.arg(QString::fromStdString(rpcs3::utils::get_hdd0_game_dir()))
|
||||||
.arg(gui::utils::format_byte_size(free_space))
|
.arg(gui::utils::format_byte_size(free_space))
|
||||||
.arg(info.data_size <= free_space ? QString() : tr(" - <b>NOT ENOUGH SPACE</b>"))
|
.arg(info.data_size <= free_space ? QString() : tr(" - <b>NOT ENOUGH SPACE</b>"))
|
||||||
.arg(gui::utils::format_byte_size(info.data_size));
|
.arg(gui::utils::format_byte_size(info.data_size));
|
||||||
|
|
|
||||||
|
|
@ -190,7 +190,7 @@ void pkg_install_dialog::UpdateInfo(QLabel* installation_info, QDialogButtonBox*
|
||||||
|
|
||||||
installation_info->setText(gui::utils::make_paragraph(
|
installation_info->setText(gui::utils::make_paragraph(
|
||||||
tr("Installation path: %0\nAvailable disk space: %1%2\nRequired disk space: %3")
|
tr("Installation path: %0\nAvailable disk space: %1%2\nRequired disk space: %3")
|
||||||
.arg(rpcs3::utils::get_hdd0_game_dir())
|
.arg(QString::fromStdString(rpcs3::utils::get_hdd0_game_dir()))
|
||||||
.arg(gui::utils::format_byte_size(free_space))
|
.arg(gui::utils::format_byte_size(free_space))
|
||||||
.arg(data_size <= free_space ? QString() : tr(" - <b>NOT ENOUGH SPACE</b>"))
|
.arg(data_size <= free_space ? QString() : tr(" - <b>NOT ENOUGH SPACE</b>"))
|
||||||
.arg(gui::utils::format_byte_size(data_size))));
|
.arg(gui::utils::format_byte_size(data_size))));
|
||||||
|
|
|
||||||
|
|
@ -71,10 +71,14 @@ bool qt_camera_video_sink::present(const QVideoFrame& frame)
|
||||||
// Flip image if necessary
|
// Flip image if necessary
|
||||||
if (flip_horizontally || flip_vertically)
|
if (flip_horizontally || flip_vertically)
|
||||||
{
|
{
|
||||||
Qt::Orientations orientation {};
|
#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
|
||||||
|
Qt::Orientations orientation{};
|
||||||
orientation.setFlag(Qt::Orientation::Horizontal, flip_horizontally);
|
orientation.setFlag(Qt::Orientation::Horizontal, flip_horizontally);
|
||||||
orientation.setFlag(Qt::Orientation::Vertical, flip_vertically);
|
orientation.setFlag(Qt::Orientation::Vertical, flip_vertically);
|
||||||
image.flip(orientation);
|
image.flip(orientation);
|
||||||
|
#else
|
||||||
|
image.mirror(flip_horizontally, flip_vertically);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
if (image.format() != QImage::Format_RGBA8888)
|
if (image.format() != QImage::Format_RGBA8888)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue