chore: move platform/Wayland.h -> common/PlatformInfo.h
This commit is contained in:
parent
c18e3c9ef2
commit
8e83b16f5e
7 changed files with 6 additions and 12 deletions
|
|
@ -16,6 +16,7 @@ add_library(common STATIC
|
||||||
ExitCodes.h
|
ExitCodes.h
|
||||||
I18N.h
|
I18N.h
|
||||||
I18N.cpp
|
I18N.cpp
|
||||||
|
PlatformInfo.h
|
||||||
Settings.h
|
Settings.h
|
||||||
Settings.cpp
|
Settings.cpp
|
||||||
QSettingsProxy.cpp
|
QSettingsProxy.cpp
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@
|
||||||
#include "base/Log.h"
|
#include "base/Log.h"
|
||||||
#include "client/Client.h"
|
#include "client/Client.h"
|
||||||
#include "common/ExitCodes.h"
|
#include "common/ExitCodes.h"
|
||||||
|
#include "common/PlatformInfo.h"
|
||||||
#include "common/Settings.h"
|
#include "common/Settings.h"
|
||||||
#include "deskflow/Screen.h"
|
#include "deskflow/Screen.h"
|
||||||
#include "deskflow/ScreenException.h"
|
#include "deskflow/ScreenException.h"
|
||||||
|
|
@ -20,7 +21,6 @@
|
||||||
#include "net/SocketException.h"
|
#include "net/SocketException.h"
|
||||||
#include "net/SocketMultiplexer.h"
|
#include "net/SocketMultiplexer.h"
|
||||||
#include "net/TCPSocketFactory.h"
|
#include "net/TCPSocketFactory.h"
|
||||||
#include "platform/Wayland.h"
|
|
||||||
|
|
||||||
#if SYSAPI_WIN32
|
#if SYSAPI_WIN32
|
||||||
#include "arch/win32/ArchMiscWindows.h"
|
#include "arch/win32/ArchMiscWindows.h"
|
||||||
|
|
@ -47,10 +47,6 @@
|
||||||
#include "platform/OSXScreen.h"
|
#include "platform/OSXScreen.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(WINAPI_XWINDOWS) or defined(WINAPI_LIBEI)
|
|
||||||
#include "platform/Wayland.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
constexpr static auto s_retryTime = 1.0;
|
constexpr static auto s_retryTime = 1.0;
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@
|
||||||
#include "base/Log.h"
|
#include "base/Log.h"
|
||||||
#include "base/Path.h"
|
#include "base/Path.h"
|
||||||
#include "common/ExitCodes.h"
|
#include "common/ExitCodes.h"
|
||||||
|
#include "common/PlatformInfo.h"
|
||||||
#include "common/Settings.h"
|
#include "common/Settings.h"
|
||||||
#include "deskflow/App.h"
|
#include "deskflow/App.h"
|
||||||
#include "deskflow/Screen.h"
|
#include "deskflow/Screen.h"
|
||||||
|
|
@ -52,10 +53,6 @@
|
||||||
#include "platform/OSXScreen.h"
|
#include "platform/OSXScreen.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(WINAPI_XWINDOWS) or defined(WINAPI_LIBEI)
|
|
||||||
#include "platform/Wayland.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
|
||||||
using namespace deskflow::server;
|
using namespace deskflow::server;
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@
|
||||||
#include "dialogs/SettingsDialog.h"
|
#include "dialogs/SettingsDialog.h"
|
||||||
|
|
||||||
#include "base/String.h"
|
#include "base/String.h"
|
||||||
|
#include "common/PlatformInfo.h"
|
||||||
#include "common/Settings.h"
|
#include "common/Settings.h"
|
||||||
#include "common/UrlConstants.h"
|
#include "common/UrlConstants.h"
|
||||||
#include "gui/Messages.h"
|
#include "gui/Messages.h"
|
||||||
|
|
@ -27,7 +28,6 @@
|
||||||
#include "gui/ipc/DaemonIpcClient.h"
|
#include "gui/ipc/DaemonIpcClient.h"
|
||||||
#include "gui/widgets/LogDock.h"
|
#include "gui/widgets/LogDock.h"
|
||||||
#include "net/FingerprintDatabase.h"
|
#include "net/FingerprintDatabase.h"
|
||||||
#include "platform/Wayland.h"
|
|
||||||
|
|
||||||
#if defined(Q_OS_LINUX)
|
#if defined(Q_OS_LINUX)
|
||||||
#include "Config.h"
|
#include "Config.h"
|
||||||
|
|
|
||||||
|
|
@ -152,7 +152,7 @@ endif()
|
||||||
include_directories(${inc})
|
include_directories(${inc})
|
||||||
|
|
||||||
# wayland.h is included to check for wayland support
|
# wayland.h is included to check for wayland support
|
||||||
add_library(platform STATIC ${PLATFORM_SOURCES} Wayland.h)
|
add_library(platform STATIC ${PLATFORM_SOURCES})
|
||||||
|
|
||||||
target_link_libraries(platform client ${libs})
|
target_link_libraries(platform client ${libs})
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
#include <QDBusReply>
|
#include <QDBusReply>
|
||||||
|
|
||||||
#include "common/Constants.h"
|
#include "common/Constants.h"
|
||||||
#include "platform/Wayland.h"
|
#include "common/PlatformInfo.h"
|
||||||
|
|
||||||
namespace deskflow::platform {
|
namespace deskflow::platform {
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue