From 57e3ad67eaba9d459a826ab3904dde5bb131ac08 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 30 Jan 2024 22:56:19 +0100 Subject: [PATCH] Avoid inconsistent use of config defs in syncthingwidgets for unity builds Otherwise unity builds fail due to macro redefinitions. It doesn't really matter what name is used in the web view files anyway (as it just changes some environment variables used for debugging). --- README.md | 4 ++-- syncthingwidgets/webview/webpage.cpp | 7 +++++-- syncthingwidgets/webview/webviewdialog.cpp | 5 ++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 92e7d90..c1baf19 100644 --- a/README.md +++ b/README.md @@ -577,7 +577,7 @@ It is possible to turn on logging of the underlying library by setting environme * `LIB_SYNCTHING_CONNECTOR_LOG_API_REPLIES`: log replies from Syncthing's REST-API (except events) * `LIB_SYNCTHING_CONNECTOR_LOG_EVENTS`: log events emitted by Syncthing's events REST-API endpoint * `LIB_SYNCTHING_CONNECTOR_LOG_DIRS_OR_DEVS_RESETTED`: log when folders/devices are internally reset -* `SYNCTHINGWIDGETS_LOG_JS_CONSOLE`: log message from the JavaScript console of the built-in web view +* `SYNCTHINGTRAY_LOG_JS_CONSOLE`: log message from the JavaScript console of the built-in web view ### Useful environment variables for development * `QT_QPA_PLATFORM`: set to `offscreen` to disable graphical output, e.g. to run tests in headless @@ -591,7 +591,7 @@ It is possible to turn on logging of the underlying library by setting environme * `SYNCTHING_PORT`: override the port of the Syncthing test instance spawned when running tests * `SYNCTHINGTRAY_SYSTEMD_USER_UNIT`: override the name of the systemd user-unit checked by the wizard's setup detection -* `SYNCTHINGWIDGETS_CHROMIUM_BASED_BROWSER`: override the path of the Chromium-based browser to open +* `SYNCTHINGTRAY_CHROMIUM_BASED_BROWSER`: override the path of the Chromium-based browser to open Syncthing in app mode * `LIB_SYNCTHING_CONNECTOR_USE_DEPRECATED_ROUTES`: change whether to use deprecated routes (enabled by default for compatibility with older Syncthing versions, set to `0` to change the behavior) diff --git a/syncthingwidgets/webview/webpage.cpp b/syncthingwidgets/webview/webpage.cpp index 6547df2..c601544 100644 --- a/syncthingwidgets/webview/webpage.cpp +++ b/syncthingwidgets/webview/webpage.cpp @@ -4,9 +4,12 @@ #include "../settings/settings.h" -#include +// use meta-data of syncthingtray application here +// note: Using the meta-data from the library would make more sense but this breaks +// unity builds. +#include "resources/../../tray/resources/config.h" -#include "resources/config.h" +#include #include #include diff --git a/syncthingwidgets/webview/webviewdialog.cpp b/syncthingwidgets/webview/webviewdialog.cpp index 39f98b4..28e54af 100644 --- a/syncthingwidgets/webview/webviewdialog.cpp +++ b/syncthingwidgets/webview/webviewdialog.cpp @@ -1,7 +1,10 @@ #include "./webviewdialog.h" #include "../settings/settings.h" -#include "resources/config.h" +// use meta-data of syncthingtray application here +// note: Using the meta-data from the library would make more sense but this breaks +// unity builds. +#include "resources/../../tray/resources/config.h" #include