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

Fix MacOSX OS compile and warnings

Browse Source
This commit is contained in:
elecpower
2022-09-06 09:29:41 +10:00
committed by Peter Feerick
parent bbfaf86bc8
commit 3621b26403
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/updates/updatecompanion.cpp
+4 -5
View File
@@ -28,22 +28,21 @@
#include <QDirIterator>
#ifdef Q_OS_MACOS
#define
#define OS_FILEPATTERN "edgetx-cpn-osx"
#define OS_INSTALLER_EXTN "*.dmg"
#define OS_INSTALL_QUESTION tr("Would you like to open the disk image to install the new version?")
#define OS_INSTALL_QUESTION tr("Would you like to open the disk image to install the new version of Companion?")
#elif defined(Q_OS_WIN64)
#define OS_FILEPATTERN "edgetx-cpn-win64"
#define OS_INSTALLER_EXTN "*.exe"
#define OS_INSTALL_QUESTION tr("Would you like to launch the installer?")
#define OS_INSTALL_QUESTION tr("Would you like to launch the Companion installer?")
#elif defined(Q_OS_WIN32)
#define OS_FILEPATTERN "edgetx-cpn-win32"
#define OS_INSTALLER_EXTN "*.exe"
#define OS_INSTALL_QUESTION tr("Would you like to launch the installer?")
#define OS_INSTALL_QUESTION tr("Would you like to launch the Companion installer?")
#else
#define OS_FILEPATTERN "edgetx-cpn-linux"
#define OS_INSTALLER_EXTN "*.AppImage"
#define OS_INSTALL_QUESTION tr("Would you like to open the app image to install the new version?")
#define OS_INSTALL_QUESTION tr("Would you like to open the app image to install the new version of Companion?")
#endif
UpdateCompanion::UpdateCompanion(QWidget * parent) :
companion/src/updates/updatecompanion.h
+4 -4
View File
@@ -34,8 +34,8 @@ class UpdateCompanion : public UpdateInterface
protected:
virtual bool asyncInstall() override;
virtual const QString currentRelease();
virtual const QString currentVersion();
virtual const bool isLatestRelease();
virtual const bool isUpdateAvailable();
virtual const QString currentRelease() override;
virtual const QString currentVersion() override;
virtual const bool isLatestRelease() override;
virtual const bool isUpdateAvailable() override;
};