From 596a0187a5067cfe8c8c8c924ac23c6939cbdfbd Mon Sep 17 00:00:00 2001 From: Mykola Baibuz Date: Wed, 6 Sep 2023 20:11:50 +0300 Subject: [PATCH] Linux build fix --- client/mozilla/networkwatcher.cpp | 4 ++-- client/mozilla/pingsenderfactory.cpp | 5 +++-- service/server/localserver.h | 9 ++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/mozilla/networkwatcher.cpp b/client/mozilla/networkwatcher.cpp index 47fdb6227..54beb11c0 100644 --- a/client/mozilla/networkwatcher.cpp +++ b/client/mozilla/networkwatcher.cpp @@ -19,7 +19,7 @@ #endif #ifdef MZ_LINUX -# include "platforms/linux/linuxnetworkwatcher.h" +//# include "platforms/linux/linuxnetworkwatcher.h" #endif #ifdef MZ_MACOS @@ -56,7 +56,7 @@ void NetworkWatcher::initialize() { #if defined(MZ_WINDOWS) m_impl = new WindowsNetworkWatcher(this); #elif defined(MZ_LINUX) - m_impl = new LinuxNetworkWatcher(this); +// m_impl = new LinuxNetworkWatcher(this); #elif defined(MZ_MACOS) m_impl = new MacOSNetworkWatcher(this); #elif defined(MZ_WASM) diff --git a/client/mozilla/pingsenderfactory.cpp b/client/mozilla/pingsenderfactory.cpp index a7a6c65f4..c7ecdec89 100644 --- a/client/mozilla/pingsenderfactory.cpp +++ b/client/mozilla/pingsenderfactory.cpp @@ -5,7 +5,7 @@ #include "pingsenderfactory.h" #if defined(MZ_LINUX) || defined(MZ_ANDROID) -# include "platforms/linux/linuxpingsender.h" +//# include "platforms/linux/linuxpingsender.h" #elif defined(MZ_MACOS) || defined(MZ_IOS) # include "platforms/macos/macospingsender.h" #elif defined(MZ_WINDOWS) @@ -19,7 +19,8 @@ PingSender* PingSenderFactory::create(const QHostAddress& source, QObject* parent) { #if defined(MZ_LINUX) || defined(MZ_ANDROID) - return new LinuxPingSender(source, parent); + return nullptr; + // return new LinuxPingSender(source, parent); #elif defined(MZ_MACOS) || defined(MZ_IOS) return new MacOSPingSender(source, parent); #elif defined(MZ_WINDOWS) diff --git a/service/server/localserver.h b/service/server/localserver.h index 041add8ed..b5264120c 100644 --- a/service/server/localserver.h +++ b/service/server/localserver.h @@ -10,13 +10,13 @@ #include "ipcserver.h" -#include "../../client/daemon/daemonlocalserver.h" - #ifdef Q_OS_WIN +#include "../../client/daemon/daemonlocalserver.h" #include "windows/daemon/windowsdaemon.h" #endif #ifdef Q_OS_MAC +#include "../../client/daemon/daemonlocalserver.h" #include "macos/daemon/macosdaemon.h" #endif @@ -38,13 +38,12 @@ class LocalServer : public QObject QRemoteObjectHost m_serverNode; bool m_isRemotingEnabled = false; - - DaemonLocalServer server{qApp}; - #ifdef Q_OS_WIN + DaemonLocalServer server{qApp}; WindowsDaemon daemon; #endif #ifdef Q_OS_MAC + DaemonLocalServer server{qApp}; MacOSDaemon daemon; #endif };