piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

chore(cpn): update to Qt 5.15.2 and rework application packaging (#4270)

Browse Source 
Co-authored-by: raphaelcoeffic <raphael.coeffic@frafos.com>
Co-authored-by: philmoz <phil.a.mitchell@gmail.com>
This commit is contained in:
Neil Horne
2023-11-10 15:12:28 +10:00
committed by GitHub
co-authored by raphaelcoeffic philmoz
parent 9d5c6e62cb
commit a3faf7e9df
49 changed files with 347 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/flashfirmwaredialog.cpp
+2 -4
View File
@@ -227,11 +227,9 @@ void FlashFirmwareDialog::on_burnButton_clicked()
if (imageSource != FIRMWARE) {
// load the splash image
const QPixmap * pixmap = ui->splash->pixmap();
const QPixmap pixmap = ui->splash->pixmap(Qt::ReturnByValue);
QImage image;
if (pixmap) {
image = pixmap->toImage().scaled(ui->splash->width(), ui->splash->height());
}
image = pixmap.toImage().scaled(ui->splash->width(), ui->splash->height());
if (image.isNull()) {
QMessageBox::critical(this, CPN_STR_TTL_WARNING, tr("Splash image not found"));
return;