claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manager/CMake: More thoroughly disable the update checker when no build number is present

Browse Source
This commit is contained in:
Alexander Babikov
2025-07-30 23:50:48 +05:00
parent 8915fa9263
commit 37481032ed
4 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/qt/CMakeLists.txt
View File

@@ -187,14 +187,6 @@ add_library(ui STATIC
qt_mediahistorymanager.cpp qt_mediahistorymanager.cpp
qt_mediahistorymanager.hpp qt_mediahistorymanager.hpp
qt_updatecheck.cpp
qt_updatecheck.hpp
qt_updatecheckdialog.cpp
qt_updatecheckdialog.hpp
qt_updatecheckdialog.ui
qt_updatedetails.cpp
qt_updatedetails.hpp
qt_updatedetails.ui
qt_downloader.cpp qt_downloader.cpp
qt_downloader.hpp qt_downloader.hpp
@@ -245,6 +237,19 @@ add_library(ui STATIC
qt_iconindicators.cpp qt_iconindicators.cpp
) )
if(EMU_BUILD_NUM)
target_sources(ui PRIVATE
qt_updatecheck.cpp
qt_updatecheck.hpp
qt_updatecheckdialog.cpp
qt_updatecheckdialog.hpp
qt_updatecheckdialog.ui
qt_updatedetails.cpp
qt_updatedetails.hpp
qt_updatedetails.ui
)
endif()
if(RTMIDI) if(RTMIDI)
target_compile_definitions(ui PRIVATE USE_RTMIDI) target_compile_definitions(ui PRIVATE USE_RTMIDI)
endif() endif()

5
src/qt/qt_vmmanager_main.hpp
View File

@@ -18,8 +18,6 @@
#ifndef QT_VMMANAGER_MAIN_H #ifndef QT_VMMANAGER_MAIN_H
#define QT_VMMANAGER_MAIN_H #define QT_VMMANAGER_MAIN_H
#include "qt_updatecheck.hpp"
#include <QWidget> #include <QWidget>
#include "qt_vmmanager_model.hpp" #include "qt_vmmanager_model.hpp"
#include "qt_vmmanager_details.hpp" #include "qt_vmmanager_details.hpp"
@@ -31,6 +29,9 @@ extern "C" {
#include <86box/86box.h> // for vmm_path #include <86box/86box.h> // for vmm_path
} }
#if EMU_BUILD_NUM != 0
# include "qt_updatecheck.hpp"
#endif
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace Ui { class VMManagerMain; } namespace Ui { class VMManagerMain; }

4
src/qt/qt_vmmanager_mainwindow.cpp
View File

@@ -19,7 +19,9 @@
#include "qt_vmmanager_main.hpp" #include "qt_vmmanager_main.hpp"
#include "qt_vmmanager_preferences.hpp" #include "qt_vmmanager_preferences.hpp"
#include "ui_qt_vmmanager_mainwindow.h" #include "ui_qt_vmmanager_mainwindow.h"
#if EMU_BUILD_NUM != 0
# include "qt_updatecheckdialog.hpp" # include "qt_updatecheckdialog.hpp"
#endif
#include <QLineEdit> #include <QLineEdit>
#include <QStringListModel> #include <QStringListModel>
@@ -171,6 +173,7 @@ VMManagerMainWindow::setStatusRight(const QString &text) const
statusRight->setText(text); statusRight->setText(text);
} }
#if EMU_BUILD_NUM != 0
void void
VMManagerMainWindow::checkForUpdatesTriggered() VMManagerMainWindow::checkForUpdatesTriggered()
{ {
@@ -181,6 +184,7 @@ VMManagerMainWindow::checkForUpdatesTriggered()
const auto updateCheck = new UpdateCheckDialog(updateChannel); const auto updateCheck = new UpdateCheckDialog(updateChannel);
updateCheck->exec(); updateCheck->exec();
} }
#endif
void VMManagerMainWindow::on_actionExit_triggered() void VMManagerMainWindow::on_actionExit_triggered()
{ {

2
src/qt/qt_vmmanager_mainwindow.hpp
View File

@@ -50,7 +50,9 @@ public slots:
private slots: private slots:
void vmmSelectionChanged(const QModelIndex &currentSelection, QProcess::ProcessState processState) const; void vmmSelectionChanged(const QModelIndex &currentSelection, QProcess::ProcessState processState) const;
void preferencesTriggered(); void preferencesTriggered();
#if EMU_BUILD_NUM != 0
static void checkForUpdatesTriggered(); static void checkForUpdatesTriggered();
#endif
void on_actionExit_triggered(); void on_actionExit_triggered();