[compat] fix solaris Qt build (#194)

Co-authored-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/194
Reviewed-by: crueter <crueter@eden-emu.dev>
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>

18 files changed, 83 insertions, 75 deletions

diff --git a/src/common/android/multiplayer/multiplayer.cpp b/src/common/android/multiplayer/multiplayer.cpp
index 26bb800ce2..ff57eedec3 100644
--- a/src/common/android/multiplayer/multiplayer.cpp
+++ b/src/common/android/multiplayer/multiplayer.cpp
@@ -205,8 +205,8 @@ NetPlayStatus AndroidMultiplayer::NetPlayCreateRoom(const std::string &ipaddress
 
     std::string token;
     // TODO(alekpop): properly handle the compile definition, it's not working right
-//#ifdef ENABLE_WEB_SERVICE
-//    LOG_INFO(WebService, "Web Service enabled");
+#ifdef ENABLE_WEB_SERVICE
+    LOG_INFO(WebService, "Web Service enabled");
     if (isPublic) {
         WebService::Client client(Settings::values.web_api_url.GetValue(),
                                   Settings::values.eden_username.GetValue(),
@@ -220,9 +220,9 @@ NetPlayStatus AndroidMultiplayer::NetPlayCreateRoom(const std::string &ipaddress
             LOG_INFO(WebService, "Successfully requested external JWT: size={}", token.size());
         }
     }
-//#else
-//    LOG_INFO(WebService, "Web Service disabled");
-//#endif
+#else
+    LOG_ERROR(WebService, "Web Service disabled");
+#endif
 
     member->Join(username, ipaddress.c_str(), static_cast<u16>(port), 0, Network::NoPreferredIP,
                  password, token);
@@ -432,12 +432,12 @@ std::vector<std::string> AndroidMultiplayer::NetPlayGetBanList() {
 std::unique_ptr<Network::VerifyUser::Backend> AndroidMultiplayer::CreateVerifyBackend(bool use_validation) {
     std::unique_ptr<Network::VerifyUser::Backend> verify_backend;
     if (use_validation) {
-//#ifdef ENABLE_WEB_SERVICE
+#ifdef ENABLE_WEB_SERVICE
         verify_backend =
             std::make_unique<WebService::VerifyUserJWT>(Settings::values.web_api_url.GetValue());
-//#else
-//        verify_backend = std::make_unique<Network::VerifyUser::NullBackend>();
-//#endif
+#else
+        verify_backend = std::make_unique<Network::VerifyUser::NullBackend>();
+#endif
     } else {
         verify_backend = std::make_unique<Network::VerifyUser::NullBackend>();
     }
diff --git a/src/common/host_memory.cpp b/src/common/host_memory.cpp
index 9e34cd3ac6..949cd188f3 100644
--- a/src/common/host_memory.cpp
+++ b/src/common/host_memory.cpp
@@ -442,16 +442,15 @@ static int shm_open_anon(int flags, mode_t mode) {
         for (char *fill = start; fill < limit; r /= 8)
             *fill++ = '0' + (r % 8);
         int fd = shm_open(name, flags, mode);
-        if (fd != -1)
-            return ([](const char *name, int fd) {
-                if (shm_unlink(name) == -1) {
-                    int tmp = errno;
-                    close(fd);
-                    errno = tmp;
-                    return -1;
-                }
-                return fd;
-            })(name, fd);
+        if (fd != -1) {
+            if (shm_unlink(name) == -1) {
+                int tmp = errno;
+                close(fd);
+                errno = tmp;
+                return -1;
+            }
+            return fd;
+        }
         if (errno != EEXIST)
             break;
     }
@@ -464,15 +463,13 @@ static int shm_open_anon(int flags, mode_t mode) {
     int fd;
     if ((fd = shm_mkstemp(name)) == -1)
         return -1;
-    return ([](const char *name, int fd) {
-        if (shm_unlink(name) == -1) {
-            int tmp = errno;
-            close(fd);
-            errno = tmp;
-            return -1;
-        }
-        return fd;
-    })(name, fd);
+    if (shm_unlink(name) == -1) {
+        int tmp = errno;
+        close(fd);
+        errno = tmp;
+        return -1;
+    }
+    return fd;
 }
 #endif
 
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 8159bea87e..03e86b0d99 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1199,8 +1199,8 @@ if (MINGW)
 endif()
 
 if (ENABLE_WEB_SERVICE)
-    target_compile_definitions(core PRIVATE -DENABLE_WEB_SERVICE)
-    target_link_libraries(core PRIVATE web_service)
+    target_compile_definitions(core PUBLIC -DENABLE_WEB_SERVICE)
+    target_link_libraries(core PUBLIC web_service)
 endif()
 
 if (HAS_NCE)
diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp
index 7785c1d163..49179617a7 100644
--- a/src/core/internal_network/network.cpp
+++ b/src/core/internal_network/network.cpp
@@ -12,7 +12,7 @@
 #ifdef _WIN32
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#elif YUZU_UNIX
+#elif defined(__unix__)
 #include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -77,7 +77,7 @@ SOCKET GetInterruptSocket() {
 sockaddr TranslateFromSockAddrIn(SockAddrIn input) {
     sockaddr_in result;
 
-#if YUZU_UNIX
+#ifdef __unix__
     result.sin_len = sizeof(result);
 #endif
 
@@ -162,7 +162,7 @@ Errno TranslateNativeError(int e, CallType call_type = CallType::Other) {
     }
 }
 
-#elif YUZU_UNIX // ^ _WIN32 v YUZU_UNIX
+#elif defined(__unix__) // ^ _WIN32 v __unix__
 
 using SOCKET = int;
 using WSAPOLLFD = pollfd;
@@ -835,7 +835,7 @@ std::pair<s32, Errno> Socket::Send(std::span<const u8> message, int flags) {
     ASSERT(flags == 0);
 
     int native_flags = 0;
-#if YUZU_UNIX
+#ifdef __unix__
     native_flags |= MSG_NOSIGNAL; // do not send us SIGPIPE
 #endif
     const auto result = send(fd, reinterpret_cast<const char*>(message.data()),
diff --git a/src/core/internal_network/network.h b/src/core/internal_network/network.h
index b7b7d773a4..64f3f121df 100644
--- a/src/core/internal_network/network.h
+++ b/src/core/internal_network/network.h
@@ -13,7 +13,7 @@
 
 #ifdef _WIN32
 #include <winsock2.h>
-#elif YUZU_UNIX
+#else
 #include <netinet/in.h>
 #endif
 
@@ -104,7 +104,7 @@ constexpr IPv4Address TranslateIPv4(in_addr addr) {
     auto& bytes = addr.S_un.S_un_b;
     return IPv4Address{bytes.s_b1, bytes.s_b2, bytes.s_b3, bytes.s_b4};
 }
-#elif YUZU_UNIX
+#elif defined(__unix__)
 constexpr IPv4Address TranslateIPv4(in_addr addr) {
     const u32 bytes = addr.s_addr;
     return IPv4Address{static_cast<u8>(bytes), static_cast<u8>(bytes >> 8),
diff --git a/src/core/internal_network/socket_proxy.cpp b/src/core/internal_network/socket_proxy.cpp
index eba1e28c5e..c263fb4ca8 100644
--- a/src/core/internal_network/socket_proxy.cpp
+++ b/src/core/internal_network/socket_proxy.cpp
@@ -15,7 +15,7 @@
 #include "core/internal_network/socket_proxy.h"
 #include "network/network.h"
 
-#if YUZU_UNIX
+#ifdef __unix__
 #include <sys/socket.h>
 #endif
 
diff --git a/src/core/internal_network/sockets.h b/src/core/internal_network/sockets.h
index 3a32dff75d..65ebb893ad 100644
--- a/src/core/internal_network/sockets.h
+++ b/src/core/internal_network/sockets.h
@@ -9,7 +9,11 @@
 #include <utility>
 
 #if defined(_WIN32)
-#elif !YUZU_UNIX
+// windows
+#elif defined(__unix__)
+// unix
+#else
+// haiku
 #error "Platform not implemented"
 #endif
 
@@ -24,7 +28,7 @@ struct ProxyPacket;
 
 class SocketBase {
 public:
-#ifdef YUZU_UNIX
+#ifdef __unix__
     using SOCKET = int;
     static constexpr SOCKET INVALID_SOCKET = -1;
     static constexpr SOCKET SOCKET_ERROR = -1;
diff --git a/src/network/announce_multiplayer_session.cpp b/src/network/announce_multiplayer_session.cpp
index 9d86ea378c..d2a47de73d 100644
--- a/src/network/announce_multiplayer_session.cpp
+++ b/src/network/announce_multiplayer_session.cpp
@@ -13,9 +13,9 @@
 #include "common/settings.h"
 #include "network/network.h"
 
-//#ifdef ENABLE_WEB_SERVICE
+#ifdef ENABLE_WEB_SERVICE
 #include "web_service/announce_room_json.h"
-//#endif
+#endif
 
 namespace Core {
 
@@ -28,7 +28,7 @@ AnnounceMultiplayerSession::AnnounceMultiplayerSession() {
                                                      Settings::values.eden_username.GetValue(),
                                                      Settings::values.eden_token.GetValue());
 #else
-   backend = std::make_unique<AnnounceMultiplayerRoom::NullBackend>();
+    backend = std::make_unique<AnnounceMultiplayerRoom::NullBackend>();
 #endif
 }
 
@@ -155,11 +155,12 @@ bool AnnounceMultiplayerSession::IsRunning() const {
 
 void AnnounceMultiplayerSession::UpdateCredentials() {
     ASSERT_MSG(!IsRunning(), "Credentials can only be updated when session is not running");
-
 #ifdef ENABLE_WEB_SERVICE
     backend = std::make_unique<WebService::RoomJson>(Settings::values.web_api_url.GetValue(),
                                                      Settings::values.eden_username.GetValue(),
                                                      Settings::values.eden_token.GetValue());
+#else
+    backend = std::make_unique<AnnounceMultiplayerRoom::NullBackend>();
 #endif
 }
 
diff --git a/src/video_core/renderer_opengl/gl_device.cpp b/src/video_core/renderer_opengl/gl_device.cpp
index 9be1b08055..3cb7529a64 100644
--- a/src/video_core/renderer_opengl/gl_device.cpp
+++ b/src/video_core/renderer_opengl/gl_device.cpp
@@ -24,6 +24,8 @@ using namespace Common::Literals;
 
 namespace OpenGL {
 namespace {
+
+// TODO: Needs to explicitly enable ARB_TESSELLATION_SHADER for GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS
 constexpr std::array LIMIT_UBOS = {
     GL_MAX_VERTEX_UNIFORM_BLOCKS,          GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS,
     GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS, GL_MAX_GEOMETRY_UNIFORM_BLOCKS,
@@ -62,7 +64,7 @@ bool HasExtension(std::span<const std::string_view> extensions, std::string_view
 }
 
 std::array<u32, Shader::MaxStageTypes> BuildMaxUniformBuffers() noexcept {
-    std::array<u32, Shader::MaxStageTypes> max;
+    std::array<u32, Shader::MaxStageTypes> max{};
     std::ranges::transform(LIMIT_UBOS, max.begin(), &GetInteger<u32>);
     return max;
 }
@@ -108,7 +110,7 @@ bool IsASTCSupported() {
 
 static bool HasSlowSoftwareAstc(std::string_view vendor_name, std::string_view renderer) {
 // ifdef for Unix reduces string comparisons for non-Windows drivers, and Intel
-#ifdef YUZU_UNIX
+#ifdef __unix__
     // Sorted vaguely by how likely a vendor is to appear
     if (vendor_name == "AMD") {
         // RadeonSI
diff --git a/src/video_core/renderer_opengl/gl_staging_buffer_pool.cpp b/src/video_core/renderer_opengl/gl_staging_buffer_pool.cpp
index bdd8e47f61..5767d6b7de 100644
--- a/src/video_core/renderer_opengl/gl_staging_buffer_pool.cpp
+++ b/src/video_core/renderer_opengl/gl_staging_buffer_pool.cpp
@@ -60,6 +60,7 @@ size_t StagingBuffers::RequestBuffer(size_t requested_size) {
                          storage_flags | GL_MAP_PERSISTENT_BIT);
     alloc.map = static_cast<u8*>(glMapNamedBufferRange(alloc.buffer.handle, 0, next_pow2_size,
                                                        map_flags | GL_MAP_PERSISTENT_BIT));
+    DEBUG_ASSERT(alloc.map != nullptr);
     alloc.size = next_pow2_size;
     allocs.emplace_back(std::move(alloc));
     return allocs.size() - 1;
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt
index 473355e805..2e31f47cd5 100644
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@@ -497,6 +497,11 @@ if (YUZU_ROOM)
     target_link_libraries(yuzu PRIVATE yuzu-room)
 endif()
 
+# Explicit linking required
+if (${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
+    target_link_libraries(yuzu PRIVATE X11)
+endif()
+
 # Extra deps
 add_subdirectory(externals)
 target_link_libraries(yuzu PRIVATE QuaZip::QuaZip)
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index 54c931e56c..16846878f9 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -295,7 +295,7 @@ void ConfigureGraphics::Setup(const ConfigurationShared::Builder& builder) {
             api_restore_global_button = widget->restore_button;
 
             if (!Settings::IsConfiguringGlobal()) {
-                QObject::connect(api_restore_global_button, &QAbstractButton::clicked,
+                api_restore_global_button->connect(api_restore_global_button, &QAbstractButton::clicked,
                                  [this](bool) { UpdateAPILayout(); });
 
                 // Detach API's restore button and place it where we want
@@ -327,7 +327,7 @@ void ConfigureGraphics::Setup(const ConfigurationShared::Builder& builder) {
                 restore_button->setEnabled(true);
                 widget->layout()->addWidget(restore_button);
 
-                QObject::connect(restore_button, &QAbstractButton::clicked,
+                restore_button->connect(restore_button, &QAbstractButton::clicked,
                                  [restore_button, this](bool) {
                                      Settings::values.vsync_mode.SetGlobal(true);
                                      PopulateVSyncModeSelection(true);
@@ -340,7 +340,7 @@ void ConfigureGraphics::Setup(const ConfigurationShared::Builder& builder) {
                     UpdateVsyncSetting();
                     restore_button->setVisible(true);
                 };
-                QObject::connect(widget->combobox, QOverload<int>::of(&QComboBox::activated),
+                widget->combobox->connect(widget->combobox, QOverload<int>::of(&QComboBox::activated),
                                  [set_non_global]() { set_non_global(); });
                 vsync_restore_global_button = restore_button;
             }
@@ -379,7 +379,7 @@ void ConfigureGraphics::Setup(const ConfigurationShared::Builder& builder) {
             Settings::values.bg_red.UsingGlobal(), ui->bg_widget);
         ui->bg_widget->layout()->addWidget(bg_restore_button);
 
-        QObject::connect(bg_restore_button, &QAbstractButton::clicked,
+        bg_restore_button->connect(bg_restore_button, &QAbstractButton::clicked,
                          [bg_restore_button, this](bool) {
                              const int r = Settings::values.bg_red.GetValue(true);
                              const int g = Settings::values.bg_green.GetValue(true);
@@ -390,7 +390,7 @@ void ConfigureGraphics::Setup(const ConfigurationShared::Builder& builder) {
                              bg_restore_button->setEnabled(false);
                          });
 
-        QObject::connect(ui->bg_button, &QAbstractButton::clicked, [bg_restore_button](bool) {
+        ui->bg_button->connect(ui->bg_button, &QAbstractButton::clicked, [bg_restore_button](bool) {
             bg_restore_button->setVisible(true);
             bg_restore_button->setEnabled(true);
         });
diff --git a/src/yuzu/configuration/configure_input_player_widget.cpp b/src/yuzu/configuration/configure_input_player_widget.cpp
index b3d9d8006b..5c7eb59d7c 100644
--- a/src/yuzu/configuration/configure_input_player_widget.cpp
+++ b/src/yuzu/configuration/configure_input_player_widget.cpp
@@ -2429,7 +2429,7 @@ void PlayerControlPreview::DrawProJoystick(QPainter& p, const QPointF center, co
         1.0 - std::sqrt((offset.x() * offset.x()) + (offset.y() * offset.y())) * 0.1f);
 
     const float rotation =
-        ((offset.x() == 0) ? atan(1) * 2 : atan(offset.y() / offset.x())) * (180 / (atan(1) * 4));
+        ((offset.x() == 0.f) ? std::atan(1.f) * 2.f : std::atan(offset.y() / offset.x())) * (180.f / (std::atan(1.f) * 4.f));
 
     p.save();
     p.translate(offset_center);
diff --git a/src/yuzu/configuration/shared_widget.cpp b/src/yuzu/configuration/shared_widget.cpp
index c27a4644e9..e23d86dc69 100644
--- a/src/yuzu/configuration/shared_widget.cpp
+++ b/src/yuzu/configuration/shared_widget.cpp
@@ -118,7 +118,7 @@ QWidget* Widget::CreateCheckBox(Settings::BasicSetting* bool_setting, const QStr
     };
 
     if (!Settings::IsConfiguringGlobal()) {
-        QObject::connect(checkbox, &QCheckBox::clicked, [touch]() { touch(); });
+        checkbox->connect(checkbox, &QCheckBox::clicked, [touch]() { touch(); });
     }
 
     return checkbox;
@@ -165,7 +165,7 @@ QWidget* Widget::CreateCombobox(std::function<std::string()>& serializer,
     };
 
     if (!Settings::IsConfiguringGlobal()) {
-        QObject::connect(combobox, QOverload<int>::of(&QComboBox::activated),
+        combobox->connect(combobox, QOverload<int>::of(&QComboBox::activated),
                          [touch]() { touch(); });
     }
 
@@ -223,9 +223,8 @@ QWidget* Widget::CreateRadioGroup(std::function<std::string()>& serializer,
     };
 
     if (!Settings::IsConfiguringGlobal()) {
-        for (const auto& [id, button] : radio_buttons) {
-            QObject::connect(button, &QAbstractButton::clicked, [touch]() { touch(); });
-        }
+        for (const auto& [id, button] : radio_buttons)
+            button->connect(button, &QAbstractButton::clicked, [touch]() { touch(); });
     }
 
     return group;
@@ -249,7 +248,7 @@ QWidget* Widget::CreateLineEdit(std::function<std::string()>& serializer,
     };
 
     if (!Settings::IsConfiguringGlobal()) {
-        QObject::connect(line_edit, &QLineEdit::textChanged, [touch]() { touch(); });
+        line_edit->connect(line_edit, &QLineEdit::textChanged, [touch]() { touch(); });
     }
 
     return line_edit;
@@ -266,7 +265,7 @@ static void CreateIntSlider(Settings::BasicSetting& setting, bool reversed, floa
         feedback->setText(use_format.arg(QVariant::fromValue(present).value<QString>()));
     };
 
-    QObject::connect(slider, &QAbstractSlider::valueChanged, update_feedback);
+    slider->connect(slider, &QAbstractSlider::valueChanged, update_feedback);
     update_feedback(std::strtol(setting.ToString().c_str(), nullptr, 0));
 
     slider->setMinimum(std::strtol(setting.MinVal().c_str(), nullptr, 0));
@@ -293,7 +292,7 @@ static void CreateFloatSlider(Settings::BasicSetting& setting, bool reversed, fl
         feedback->setText(use_format.arg(QVariant::fromValue(present).value<QString>()));
     };
 
-    QObject::connect(slider, &QAbstractSlider::valueChanged, update_feedback);
+    slider->connect(slider, &QAbstractSlider::valueChanged, update_feedback);
     update_feedback(std::strtof(setting.ToString().c_str(), nullptr));
 
     slider->setMinimum(min_val * use_multiplier);
@@ -346,7 +345,7 @@ QWidget* Widget::CreateSlider(bool reversed, float multiplier, const QString& gi
     slider->setInvertedAppearance(reversed);
 
     if (!Settings::IsConfiguringGlobal()) {
-        QObject::connect(slider, &QAbstractSlider::actionTriggered, [touch]() { touch(); });
+        slider->connect(slider, &QAbstractSlider::actionTriggered, [touch]() { touch(); });
     }
 
     return container;
@@ -376,7 +375,7 @@ QWidget* Widget::CreateSpinBox(const QString& given_suffix,
     };
 
     if (!Settings::IsConfiguringGlobal()) {
-        QObject::connect(spinbox, QOverload<int>::of(&QSpinBox::valueChanged), [this, touch]() {
+        spinbox->connect(spinbox, QOverload<int>::of(&QSpinBox::valueChanged), [this, touch]() {
             if (spinbox->value() != std::strtol(setting.ToStringGlobal().c_str(), nullptr, 0)) {
                 touch();
             }
@@ -410,7 +409,7 @@ QWidget* Widget::CreateDoubleSpinBox(const QString& given_suffix,
     };
 
     if (!Settings::IsConfiguringGlobal()) {
-        QObject::connect(double_spinbox, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+        double_spinbox->connect(double_spinbox, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
                          [this, touch]() {
                              if (double_spinbox->value() !=
                                  std::strtod(setting.ToStringGlobal().c_str(), nullptr)) {
@@ -453,8 +452,7 @@ QWidget* Widget::CreateHexEdit(std::function<std::string()>& serializer,
     restore_func = [this, to_hex]() { line_edit->setText(to_hex(RelevantDefault(setting))); };
 
     if (!Settings::IsConfiguringGlobal()) {
-
-        QObject::connect(line_edit, &QLineEdit::textChanged, [touch]() { touch(); });
+        line_edit->connect(line_edit, &QLineEdit::textChanged, [touch]() { touch(); });
     }
 
     return line_edit;
@@ -488,7 +486,7 @@ QWidget* Widget::CreateDateTimeEdit(bool disabled, bool restrict,
     restore_func = [this, get_clear_val]() { date_time_edit->setDateTime(get_clear_val()); };
 
     if (!Settings::IsConfiguringGlobal()) {
-        QObject::connect(date_time_edit, &QDateTimeEdit::editingFinished,
+        date_time_edit->connect(date_time_edit, &QDateTimeEdit::editingFinished,
                          [this, get_clear_val, touch]() {
                              if (date_time_edit->dateTime() != get_clear_val()) {
                                  touch();
@@ -665,7 +663,7 @@ void Widget::SetupComponent(const QString& label, std::function<void()>& load_fu
     } else {
         layout->addWidget(restore_button);
 
-        QObject::connect(restore_button, &QAbstractButton::clicked,
+        restore_button->connect(restore_button, &QAbstractButton::clicked,
                          [this, restore_func, checkbox_restore_func](bool) {
                              LOG_DEBUG(Frontend, "Restore global state for \"{}\"",
                                        setting.GetLabel());
diff --git a/src/yuzu/discord_impl.cpp b/src/yuzu/discord_impl.cpp
index 04f4ddb3a1..497fa0f115 100644
--- a/src/yuzu/discord_impl.cpp
+++ b/src/yuzu/discord_impl.cpp
@@ -100,7 +100,7 @@ void DiscordImpl::Update() {
         request.setTransferTimeout(3000);
         QNetworkReply* reply = manager.head(request);
         QEventLoop request_event_loop;
-        QObject::connect(reply, &QNetworkReply::finished, &request_event_loop, &QEventLoop::quit);
+        reply->connect(reply, &QNetworkReply::finished, &request_event_loop, &QEventLoop::quit);
         request_event_loop.exec();
         UpdateGameStatus(reply->error());
 
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 2ad8ed9720..4e0ff685bf 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -536,7 +536,7 @@ GMainWindow::GMainWindow(bool has_broken_vulkan)
             }
             return QString{};
         });
-        QObject::connect(&update_watcher, &QFutureWatcher<QString>::finished, this,
+        update_watcher.connect(&update_watcher, &QFutureWatcher<QString>::finished, this,
                          &GMainWindow::OnEmulatorUpdateAvailable);
         update_watcher.setFuture(update_future);
     }
@@ -5786,7 +5786,7 @@ int main(int argc, char* argv[]) {
     // After settings have been loaded by GMainWindow, apply the filter
     main_window.show();
 
-    QObject::connect(&app, &QGuiApplication::applicationStateChanged, &main_window,
+    app.connect(&app, &QGuiApplication::applicationStateChanged, &main_window,
                      &GMainWindow::OnAppFocusStateChanged);
 
     int result = app.exec();
diff --git a/src/yuzu/startup_checks.cpp b/src/yuzu/startup_checks.cpp
index 6eefc94ed0..2e77c7cd06 100644
--- a/src/yuzu/startup_checks.cpp
+++ b/src/yuzu/startup_checks.cpp
@@ -7,7 +7,7 @@
 #include <cstring>
 #include <processthreadsapi.h>
 #include <windows.h>
-#elif defined(YUZU_UNIX)
+#else
 #include <cstring>
 #include <errno.h>
 #include <spawn.h>
@@ -56,7 +56,7 @@ bool CheckEnvVars(bool* is_child) {
                    IS_CHILD_ENV_VAR, GetLastError());
         return true;
     }
-#elif defined(YUZU_UNIX)
+#else
     const char* startup_check_var = getenv(STARTUP_CHECK_ENV_VAR);
     if (startup_check_var != nullptr &&
         std::strncmp(startup_check_var, ENV_VAR_ENABLED_TEXT, 8) == 0) {
@@ -110,7 +110,7 @@ bool StartupChecks(const char* arg0, bool* has_broken_vulkan, bool perform_vulka
                    STARTUP_CHECK_ENV_VAR, GetLastError());
     }
 
-#elif defined(YUZU_UNIX)
+#else
     const int env_var_set = setenv(STARTUP_CHECK_ENV_VAR, ENV_VAR_ENABLED_TEXT, 1);
     if (env_var_set == -1) {
         const int err = errno;
@@ -175,7 +175,7 @@ bool SpawnChild(const char* arg0, PROCESS_INFORMATION* pi, int flags) {
 
     return true;
 }
-#elif defined(YUZU_UNIX)
+#else
 pid_t SpawnChild(const char* arg0) {
     const pid_t pid = fork();
 
diff --git a/src/yuzu/startup_checks.h b/src/yuzu/startup_checks.h
index 2f86fb843d..79bf8beba1 100644
--- a/src/yuzu/startup_checks.h
+++ b/src/yuzu/startup_checks.h
@@ -5,7 +5,7 @@
 
 #ifdef _WIN32
 #include <windows.h>
-#elif defined(YUZU_UNIX)
+#else
 #include <sys/types.h>
 #endif
 
@@ -19,6 +19,6 @@ bool StartupChecks(const char* arg0, bool* has_broken_vulkan, bool perform_vulka
 
 #ifdef _WIN32
 bool SpawnChild(const char* arg0, PROCESS_INFORMATION* pi, int flags);
-#elif defined(YUZU_UNIX)
+#else
 pid_t SpawnChild(const char* arg0);
 #endif