blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 07:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/conan-2

Browse source
This commit is contained in:
Dan Paulat 2024-11-30 01:33:02 -06:00
commit e3fa3fdd61
8 changed files with 205 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scwx-qt/scwx-qt.cmake
View file

@ -21,9 +21,7 @@ find_package(Python COMPONENTS Interpreter)
find_package(SQLite3)
find_package(QT NAMES Qt6
COMPONENTS BuildInternals
Core
Gui
COMPONENTS Gui
LinguistTools
Multimedia
Network
@ -37,9 +35,7 @@ find_package(QT NAMES Qt6
REQUIRED)
find_package(Qt${QT_VERSION_MAJOR}
COMPONENTS BuildInternals
Core
Gui
COMPONENTS Gui
LinguistTools
Multimedia
Network
@ -510,6 +506,7 @@ source_group("I18N Files" FILES ${TS_FILES})
add_library(scwx-qt OBJECT ${PROJECT_SOURCES})
set_property(TARGET scwx-qt PROPERTY AUTOMOC ON)
set_property(TARGET scwx-qt PROPERTY AUTOGEN_ORIGIN_DEPENDS OFF)
add_custom_command(OUTPUT ${COUNTIES_SQLITE_DB}
COMMAND ${Python_EXECUTABLE}

2
scwx-qt/source/scwx/qt/manager/log_manager.cpp
View file

@ -6,7 +6,7 @@
#include <ranges>
#include <unordered_map>
#include <boost/process/environment.hpp>
#include <boost/process/v1/environment.hpp>
#include <fmt/format.h>
#include <spdlog/spdlog.h>
#include <QStandardPaths>

7
scwx-qt/source/scwx/qt/ui/setup/setup_wizard.cpp
View file

@ -22,6 +22,9 @@ class SetupWizard::Impl
public:
explicit Impl() = default;
~Impl() = default;
bool mapProviderPageIsRequired_ {MapProviderPage::IsRequired()};
bool audioCodecPageIsRequired_ {AudioCodecPage::IsRequired()};
};
SetupWizard::SetupWizard(QWidget* parent) :
@ -66,14 +69,14 @@ int SetupWizard::nextId() const
{
case static_cast<int>(Page::MapProvider):
case static_cast<int>(Page::MapLayout):
if (MapProviderPage::IsRequired())
if (p->mapProviderPageIsRequired_)
{
return nextId;
}
break;
case static_cast<int>(Page::AudioCodec):
if (AudioCodecPage::IsRequired())
if (p->audioCodecPageIsRequired_)
{
return nextId;
}