Allow backend libraries to be used from other projects

So far the backend libraries' include paths were relative within this repository. This means the header files could not be used at their installed location. This change replaces them with "<>" includes to fix that problem and adds a new include directory so building everything at once still works. With this change it should be easier to actually split some parts into another repository if this one would become too big.
2021-01-25 19:48:11 +01:00 · 2021-01-25 19:48:11 +01:00 · 975e86c895
parent b350aaf879
commit 975e86c895
52 changed files with 144 additions and 138 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -26,6 +26,9 @@ else()
    set(PLASMOID_DISABLED_BY_DEFAULT OFF)
 endif()

+# set the include directory used when building so the headers of the different backend libraries can be found at build time
+set(TARGET_INCLUDE_DIRECTORY_BUILD_INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include")
+
 # add options for partial build
 option(NO_LIBSYNCTHING "whether building Syncthing itself as a library should be skipped" ON)
 option(NO_CLI "whether building CLI should be skipped" OFF)
--- a/cli/application.cpp
+++ b/cli/application.cpp
@ -4,8 +4,8 @@
 #include "./jsdefs.h"
 #include "./jsincludes.h"

-#include "../connector/syncthingconfig.h"
-#include "../connector/utils.h"
+#include <syncthingconnector/syncthingconfig.h>
+#include <syncthingconnector/utils.h>

 // use header-only functions waitForSignals() and signalInfo() from test utilities; disable assertions via macro
 #define SYNCTHINGTESTHELPER_FOR_CLI
--- a/cli/application.h
+++ b/cli/application.h
@ -3,8 +3,8 @@

 #include "./args.h"

-#include "../connector/syncthingconnection.h"
-#include "../connector/syncthingconnectionsettings.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/syncthingconnectionsettings.h>

 #include <QObject>

--- a/fileitemactionplugin/syncthingdiractions.cpp
+++ b/fileitemactionplugin/syncthingdiractions.cpp
@ -1,10 +1,10 @@
 #include "./syncthingdiractions.h"
 #include "./syncthingfileitemactionstaticdata.h"

-#include "../model/syncthingicons.h"
+#include <syncthingmodel/syncthingicons.h>

-#include "../connector/syncthingdir.h"
-#include "../connector/utils.h"
+#include <syncthingconnector/syncthingdir.h>
+#include <syncthingconnector/utils.h>

 using namespace Data;

--- a/fileitemactionplugin/syncthingdiractions.h
+++ b/fileitemactionplugin/syncthingdiractions.h
@ -1,7 +1,7 @@
 #ifndef SYNCTHINGDIRACTIONS_H
 #define SYNCTHINGDIRACTIONS_H

-#include "../connector/syncthingdir.h"
+#include <syncthingconnector/syncthingdir.h>

 #include "./syncthinginfoaction.h"

--- a/fileitemactionplugin/syncthingfileitemaction.cpp
+++ b/fileitemactionplugin/syncthingfileitemaction.cpp
@ -3,7 +3,7 @@
 #include "./syncthinginfoaction.h"
 #include "./syncthingmenuaction.h"

-#include "../model/syncthingicons.h"
+#include <syncthingmodel/syncthingicons.h>

 #include <KFileItem>
 #include <KPluginFactory>
--- a/fileitemactionplugin/syncthingfileitemactionstaticdata.cpp
+++ b/fileitemactionplugin/syncthingfileitemactionstaticdata.cpp
@ -1,10 +1,10 @@
 #include "./syncthingfileitemactionstaticdata.h"

-#include "../model/syncthingicons.h"
+#include <syncthingmodel/syncthingicons.h>

-#include "../connector/syncthingconfig.h"
-#include "../connector/syncthingconnection.h"
-#include "../connector/syncthingconnectionsettings.h"
+#include <syncthingconnector/syncthingconfig.h>
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/syncthingconnectionsettings.h>

 #include <c++utilities/application/argumentparser.h>
 #include <c++utilities/io/ansiescapecodes.h>
--- a/fileitemactionplugin/syncthingfileitemactionstaticdata.h
+++ b/fileitemactionplugin/syncthingfileitemactionstaticdata.h
@ -1,7 +1,7 @@
 #ifndef SYNCTHINGFILEITEMACTIONSTATICDATA_H
 #define SYNCTHINGFILEITEMACTIONSTATICDATA_H

-#include "../connector/syncthingconnection.h"
+#include <syncthingconnector/syncthingconnection.h>

 /*!
 * \brief The SyncthingFileItemActionStaticData class holds objects required during the whole application's live time.
--- a/fileitemactionplugin/syncthingmenuaction.cpp
+++ b/fileitemactionplugin/syncthingmenuaction.cpp
@ -1,9 +1,9 @@
 #include "./syncthingmenuaction.h"
 #include "./syncthingfileitemaction.h"

-#include "../model/syncthingicons.h"
+#include <syncthingmodel/syncthingicons.h>

-#include "../connector/syncthingconnection.h"
+#include <syncthingconnector/syncthingconnection.h>

 #ifdef CPP_UTILITIES_DEBUG_BUILD
 #include <c++utilities/io/ansiescapecodes.h>
--- a/fileitemactionplugin/syncthingmenuaction.h
+++ b/fileitemactionplugin/syncthingmenuaction.h
@ -1,7 +1,7 @@
 #ifndef SYNCTHINGMENUACTION_H
 #define SYNCTHINGMENUACTION_H

-#include "../connector/syncthingnotifier.h"
+#include <syncthingconnector/syncthingnotifier.h>

 #include <KFileItemListProperties>

--- a/include/syncthingconnector
+++ b/include/syncthingconnector
@ -0,0 +1 @@
+../connector
--- a/include/syncthingmodel
+++ b/include/syncthingmodel
@ -0,0 +1 @@
+../model
--- a/include/syncthingwidgets
+++ b/include/syncthingwidgets
@ -0,0 +1 @@
+../widgets
--- a/model/syncthingdevicemodel.cpp
+++ b/model/syncthingdevicemodel.cpp
@ -2,8 +2,8 @@
 #include "./colors.h"
 #include "./syncthingicons.h"

-#include "../connector/syncthingconnection.h"
-#include "../connector/utils.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/utils.h>

 #include <c++utilities/conversion/stringconversion.h>

--- a/model/syncthingdirectorymodel.cpp
+++ b/model/syncthingdirectorymodel.cpp
@ -2,8 +2,8 @@
 #include "./colors.h"
 #include "./syncthingicons.h"

-#include "../connector/syncthingconnection.h"
-#include "../connector/utils.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/utils.h>

 #include <c++utilities/conversion/stringconversion.h>

--- a/model/syncthingdownloadmodel.cpp
+++ b/model/syncthingdownloadmodel.cpp
@ -1,7 +1,7 @@
 #include "./syncthingdownloadmodel.h"

-#include "../connector/syncthingconnection.h"
-#include "../connector/utils.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/utils.h>

 #include <QStringBuilder>

--- a/model/syncthingmodel.cpp
+++ b/model/syncthingmodel.cpp
@ -1,7 +1,7 @@
 #include "./syncthingmodel.h"
 #include "./syncthingicons.h"

-#include "../connector/syncthingconnection.h"
+#include <syncthingconnector/syncthingconnection.h>

 namespace Data {

--- a/model/syncthingrecentchangesmodel.cpp
+++ b/model/syncthingrecentchangesmodel.cpp
@ -2,8 +2,8 @@
 #include "./colors.h"
 #include "./syncthingicons.h"

-#include "../connector/syncthingconnection.h"
-#include "../connector/utils.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/utils.h>

 #include <c++utilities/conversion/stringconversion.h>

--- a/model/syncthingrecentchangesmodel.h
+++ b/model/syncthingrecentchangesmodel.h
@ -3,8 +3,8 @@

 #include "./syncthingmodel.h"

-#include "../connector/syncthingconnectionstatus.h"
-#include "../connector/syncthingdir.h"
+#include <syncthingconnector/syncthingconnectionstatus.h>
+#include <syncthingconnector/syncthingdir.h>

 #include <deque>

--- a/model/syncthingstatuscomputionmodel.cpp
+++ b/model/syncthingstatuscomputionmodel.cpp
@ -1,6 +1,6 @@
 #include "./syncthingstatuscomputionmodel.h"

-#include "../connector/syncthingconnectionsettings.h"
+#include <syncthingconnector/syncthingconnectionsettings.h>

 #include <type_traits>

--- a/model/syncthingstatusselectionmodel.cpp
+++ b/model/syncthingstatusselectionmodel.cpp
@ -1,6 +1,6 @@
 #include "./syncthingstatusselectionmodel.h"

-#include "../connector/syncthingconnection.h"
+#include <syncthingconnector/syncthingconnection.h>

 using namespace QtUtilities;

--- a/plasmoid/lib/settingsdialog.cpp
+++ b/plasmoid/lib/settingsdialog.cpp
@ -3,7 +3,7 @@

 #include "ui_appearanceoptionpage.h"

-#include "../../widgets/settings/settingsdialog.h"
+#include <syncthingwidgets/settings/settingsdialog.h>

 #include <qtutilities/settingsdialog/optioncategory.h>
 #include <qtutilities/settingsdialog/optioncategorymodel.h>
--- a/plasmoid/lib/settingsdialog.h
+++ b/plasmoid/lib/settingsdialog.h
@ -1,9 +1,9 @@
 #ifndef SETTINGSDIALOG_H
 #define SETTINGSDIALOG_H

-#include "../../model/syncthingstatusselectionmodel.h"
+#include <syncthingmodel/syncthingstatusselectionmodel.h>

-#include "../../widgets/settings/settingsdialog.h"
+#include <syncthingwidgets/settings/settingsdialog.h>

 #include <qtutilities/settingsdialog/optionpage.h>

--- a/plasmoid/lib/syncthingapplet.cpp
+++ b/plasmoid/lib/syncthingapplet.cpp
@ -1,20 +1,20 @@
 #include "./syncthingapplet.h"
 #include "./settingsdialog.h"

-#include "../../connector/syncthingservice.h"
-#include "../../connector/utils.h"
+#include <syncthingconnector/syncthingservice.h>
+#include <syncthingconnector/utils.h>

-#include "../../widgets/misc/direrrorsdialog.h"
-#include "../../widgets/misc/internalerrorsdialog.h"
-#include "../../widgets/misc/otherdialogs.h"
-#include "../../widgets/misc/textviewdialog.h"
-#include "../../widgets/settings/settings.h"
-#include "../../widgets/settings/settingsdialog.h"
-#include "../../widgets/webview/webviewdialog.h"
+#include <syncthingwidgets/misc/direrrorsdialog.h>
+#include <syncthingwidgets/misc/internalerrorsdialog.h>
+#include <syncthingwidgets/misc/otherdialogs.h>
+#include <syncthingwidgets/misc/textviewdialog.h>
+#include <syncthingwidgets/settings/settings.h>
+#include <syncthingwidgets/settings/settingsdialog.h>
+#include <syncthingwidgets/webview/webviewdialog.h>

-#include "../../model/syncthingicons.h"
+#include <syncthingmodel/syncthingicons.h>

-#include "../../connector/utils.h"
+#include <syncthingconnector/utils.h>

 #include "resources/config.h"
 #include "resources/qtconfig.h"
--- a/plasmoid/lib/syncthingapplet.h
+++ b/plasmoid/lib/syncthingapplet.h
@ -1,20 +1,20 @@
 #ifndef SYNCTHINGAPPLET_H
 #define SYNCTHINGAPPLET_H

-#include "../../widgets/misc/dbusstatusnotifier.h"
-#include "../../widgets/misc/statusinfo.h"
-#include "../../widgets/webview/webviewdefs.h"
+#include <syncthingwidgets/misc/dbusstatusnotifier.h>
+#include <syncthingwidgets/misc/statusinfo.h>
+#include <syncthingwidgets/webview/webviewdefs.h>

-#include "../../model/syncthingdevicemodel.h"
-#include "../../model/syncthingdirectorymodel.h"
-#include "../../model/syncthingdownloadmodel.h"
-#include "../../model/syncthingrecentchangesmodel.h"
-#include "../../model/syncthingsortfiltermodel.h"
-#include "../../model/syncthingstatusselectionmodel.h"
+#include <syncthingmodel/syncthingdevicemodel.h>
+#include <syncthingmodel/syncthingdirectorymodel.h>
+#include <syncthingmodel/syncthingdownloadmodel.h>
+#include <syncthingmodel/syncthingrecentchangesmodel.h>
+#include <syncthingmodel/syncthingsortfiltermodel.h>
+#include <syncthingmodel/syncthingstatusselectionmodel.h>

-#include "../../connector/syncthingconnection.h"
-#include "../../connector/syncthingnotifier.h"
-#include "../../connector/syncthingservice.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/syncthingnotifier.h>
+#include <syncthingconnector/syncthingservice.h>

 #include <qtutilities/aboutdialog/aboutdialog.h>
 #include <qtutilities/models/checklistmodel.h>
--- a/testhelper/syncthingtestinstance.h
+++ b/testhelper/syncthingtestinstance.h
@ -4,7 +4,7 @@
 #include "./global.h"
 #include "./helper.h"

-#include "../connector/syncthingprocess.h"
+#include <syncthingconnector/syncthingprocess.h>

 #include <QCoreApplication>
 #include <QProcess>
--- a/tray/application/main.cpp
+++ b/tray/application/main.cpp
@ -3,12 +3,12 @@
 #include "../gui/trayicon.h"
 #include "../gui/traywidget.h"

-#include "../../widgets/misc/syncthinglauncher.h"
-#include "../../widgets/settings/settings.h"
+#include <syncthingwidgets/misc/syncthinglauncher.h>
+#include <syncthingwidgets/settings/settings.h>

-#include "../../connector/syncthingprocess.h"
+#include <syncthingconnector/syncthingprocess.h>
 #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
-#include "../../connector/syncthingservice.h"
+#include <syncthingconnector/syncthingservice.h>
 #endif

 #include "resources/config.h"
--- a/tray/gui/devbuttonsitemdelegate.cpp
+++ b/tray/gui/devbuttonsitemdelegate.cpp
@ -1,7 +1,7 @@
 #include "./devbuttonsitemdelegate.h"

-#include "../../connector/syncthingconnection.h"
-#include "../../model/syncthingdevicemodel.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingmodel/syncthingdevicemodel.h>

 #include <QApplication>
 #include <QBrush>
--- a/tray/gui/devview.cpp
+++ b/tray/gui/devview.cpp
@ -2,9 +2,9 @@
 #include "./devbuttonsitemdelegate.h"
 #include "./helper.h"

-#include "../../connector/syncthingdev.h"
-#include "../../model/syncthingdevicemodel.h"
-#include "../../model/syncthingsortfiltermodel.h"
+#include <syncthingconnector/syncthingdev.h>
+#include <syncthingmodel/syncthingdevicemodel.h>
+#include <syncthingmodel/syncthingsortfiltermodel.h>

 #include <QClipboard>
 #include <QGuiApplication>
--- a/tray/gui/dirbuttonsitemdelegate.cpp
+++ b/tray/gui/dirbuttonsitemdelegate.cpp
@ -1,6 +1,6 @@
 #include "./dirbuttonsitemdelegate.h"

-#include "../model/syncthingdirectorymodel.h"
+#include <syncthingmodel/syncthingdirectorymodel.h>

 #include <QApplication>
 #include <QBrush>
--- a/tray/gui/dirview.cpp
+++ b/tray/gui/dirview.cpp
@ -2,10 +2,10 @@
 #include "./dirbuttonsitemdelegate.h"
 #include "./helper.h"

-#include "../../connector/syncthingconnection.h"
-#include "../../model/syncthingdirectorymodel.h"
-#include "../../model/syncthingsortfiltermodel.h"
-#include "../../widgets/misc/direrrorsdialog.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingmodel/syncthingdirectorymodel.h>
+#include <syncthingmodel/syncthingsortfiltermodel.h>
+#include <syncthingwidgets/misc/direrrorsdialog.h>

 #include <QClipboard>
 #include <QGuiApplication>
--- a/tray/gui/downloaditemdelegate.cpp
+++ b/tray/gui/downloaditemdelegate.cpp
@ -1,6 +1,6 @@
 #include "./downloaditemdelegate.h"

-#include "../../model/syncthingdownloadmodel.h"
+#include <syncthingmodel/syncthingdownloadmodel.h>

 #include <QApplication>
 #include <QBrush>
--- a/tray/gui/downloadview.cpp
+++ b/tray/gui/downloadview.cpp
@ -2,8 +2,8 @@
 #include "./downloaditemdelegate.h"
 #include "./helper.h"

-#include "../../connector/syncthingdir.h"
-#include "../../model/syncthingdownloadmodel.h"
+#include <syncthingconnector/syncthingdir.h>
+#include <syncthingmodel/syncthingdownloadmodel.h>

 #include <QClipboard>
 #include <QGuiApplication>
--- a/tray/gui/trayicon.cpp
+++ b/tray/gui/trayicon.cpp
@ -1,18 +1,18 @@
 #include "./trayicon.h"
 #include "./traywidget.h"

-#include "../../widgets/misc/internalerrorsdialog.h"
-#include "../../widgets/misc/statusinfo.h"
-#include "../../widgets/misc/textviewdialog.h"
-#include "../../widgets/settings/settings.h"
+#include <syncthingwidgets/misc/internalerrorsdialog.h>
+#include <syncthingwidgets/misc/statusinfo.h>
+#include <syncthingwidgets/misc/textviewdialog.h>
+#include <syncthingwidgets/settings/settings.h>

-#include "../../model/syncthingicons.h"
+#include <syncthingmodel/syncthingicons.h>

-#include "../../connector/syncthingconnection.h"
+#include <syncthingconnector/syncthingconnection.h>
 #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
-#include "../../connector/syncthingservice.h"
+#include <syncthingconnector/syncthingservice.h>
 #endif
-#include "../../connector/utils.h"
+#include <syncthingconnector/utils.h>

 #include <qtutilities/misc/dialogutils.h>

--- a/tray/gui/trayicon.h
+++ b/tray/gui/trayicon.h
@ -3,7 +3,7 @@

 #include "./traymenu.h"

-#include "../../widgets/misc/dbusstatusnotifier.h"
+#include <syncthingwidgets/misc/dbusstatusnotifier.h>

 #include <c++utilities/chrono/datetime.h>

--- a/tray/gui/traymenu.cpp
+++ b/tray/gui/traymenu.cpp
@ -2,7 +2,7 @@
 #include "./trayicon.h"
 #include "./traywidget.h"

-#include "../../widgets/settings/settings.h"
+#include <syncthingwidgets/settings/settings.h>

 #include <qtutilities/misc/dialogutils.h>

--- a/tray/gui/traywidget.cpp
+++ b/tray/gui/traywidget.cpp
@ -3,22 +3,22 @@
 #include "./trayicon.h"
 #include "./traymenu.h"

-#include "../../widgets/misc/otherdialogs.h"
-#include "../../widgets/misc/syncthinglauncher.h"
-#include "../../widgets/misc/textviewdialog.h"
-#include "../../widgets/settings/settingsdialog.h"
-#include "../../widgets/webview/webviewdialog.h"
+#include <syncthingwidgets/misc/otherdialogs.h>
+#include <syncthingwidgets/misc/syncthinglauncher.h>
+#include <syncthingwidgets/misc/textviewdialog.h>
+#include <syncthingwidgets/settings/settingsdialog.h>
+#include <syncthingwidgets/webview/webviewdialog.h>

 #ifdef SYNCTHINGTRAY_UNIFY_TRAY_MENUS
-#include "../../widgets/misc/internalerrorsdialog.h"
+#include <syncthingwidgets/misc/internalerrorsdialog.h>
 #endif

-#include "../../model/syncthingicons.h"
+#include <syncthingmodel/syncthingicons.h>

 #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
-#include "../../connector/syncthingservice.h"
+#include <syncthingconnector/syncthingservice.h>
 #endif
-#include "../../connector/utils.h"
+#include <syncthingconnector/utils.h>

 // use meta-data of syncthingtray application here
 #include "resources/../../tray/resources/config.h"
--- a/tray/gui/traywidget.h
+++ b/tray/gui/traywidget.h
@ -1,18 +1,18 @@
 #ifndef TRAY_WIDGET_H
 #define TRAY_WIDGET_H

-#include "../../widgets/settings/settings.h"
-#include "../../widgets/webview/webviewdefs.h"
+#include <syncthingwidgets/settings/settings.h>
+#include <syncthingwidgets/webview/webviewdefs.h>

-#include "../../model/syncthingdevicemodel.h"
-#include "../../model/syncthingdirectorymodel.h"
-#include "../../model/syncthingdownloadmodel.h"
-#include "../../model/syncthingrecentchangesmodel.h"
-#include "../../model/syncthingsortfiltermodel.h"
+#include <syncthingmodel/syncthingdevicemodel.h>
+#include <syncthingmodel/syncthingdirectorymodel.h>
+#include <syncthingmodel/syncthingdownloadmodel.h>
+#include <syncthingmodel/syncthingrecentchangesmodel.h>
+#include <syncthingmodel/syncthingsortfiltermodel.h>

-#include "../../connector/syncthingconnection.h"
-#include "../../connector/syncthingnotifier.h"
-#include "../../connector/syncthingprocess.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/syncthingnotifier.h>
+#include <syncthingconnector/syncthingprocess.h>

 #include <QWidget>

--- a/widgets/misc/dbusstatusnotifier.cpp
+++ b/widgets/misc/dbusstatusnotifier.cpp
@ -1,7 +1,7 @@
 #ifdef QT_UTILITIES_SUPPORT_DBUS_NOTIFICATIONS
 #include "./dbusstatusnotifier.h"

-#include "../../model/syncthingicons.h"
+#include <syncthingmodel/syncthingicons.h>

 // use meta-data of syncthingtray application here
 #include "resources/../../tray/resources/config.h"
--- a/widgets/misc/direrrorsdialog.cpp
+++ b/widgets/misc/direrrorsdialog.cpp
@ -1,8 +1,8 @@
 #include "./direrrorsdialog.h"

-#include "../../connector/syncthingconnection.h"
-#include "../../connector/syncthingdir.h"
-#include "../../connector/utils.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/syncthingdir.h>
+#include <syncthingconnector/utils.h>

 #include <QDir>
 #include <QHBoxLayout>
--- a/widgets/misc/internalerror.cpp
+++ b/widgets/misc/internalerror.cpp
@ -3,8 +3,8 @@

 #include "../settings/settings.h"

-#include "../../connector/syncthingconnection.h"
-#include "../../connector/syncthingservice.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/syncthingservice.h>

 #include <QNetworkReply>

--- a/widgets/misc/otherdialogs.cpp
+++ b/widgets/misc/otherdialogs.cpp
@ -1,7 +1,7 @@
 #include "./otherdialogs.h"

-#include "../../connector/syncthingconnection.h"
-#include "../../connector/syncthingdir.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/syncthingdir.h>

 // use meta-data of syncthingtray application here
 #include "resources/../../tray/resources/config.h"
--- a/widgets/misc/statusinfo.cpp
+++ b/widgets/misc/statusinfo.cpp
@ -1,9 +1,9 @@
 #include "./statusinfo.h"

-#include "../../connector/syncthingconnection.h"
-#include "../../connector/syncthingdev.h"
-#include "../../connector/utils.h"
-#include "../../model/syncthingicons.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/syncthingdev.h>
+#include <syncthingconnector/utils.h>
+#include <syncthingmodel/syncthingicons.h>

 #include <QCoreApplication>
 #include <QIcon>
--- a/widgets/misc/syncthingkiller.cpp
+++ b/widgets/misc/syncthingkiller.cpp
@ -1,6 +1,6 @@
 #include "./syncthingkiller.h"

-#include "../../connector/syncthingprocess.h"
+#include <syncthingconnector/syncthingprocess.h>
 #define SYNCTHINGTESTHELPER_FOR_CLI
 #include "../../testhelper/helper.h"

--- a/widgets/misc/syncthinglauncher.h
+++ b/widgets/misc/syncthinglauncher.h
@ -3,7 +3,7 @@

 #include "../global.h"

-#include "../../connector/syncthingprocess.h"
+#include <syncthingconnector/syncthingprocess.h>
 #include "../../libsyncthing/interface.h"

 #include <QByteArray>
--- a/widgets/misc/textviewdialog.cpp
+++ b/widgets/misc/textviewdialog.cpp
@ -1,7 +1,7 @@
 #include "./textviewdialog.h"

-#include "../../connector/syncthingconnection.h"
-#include "../../connector/syncthingdir.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/syncthingdir.h>

 // use meta-data of syncthingtray application here
 #include "resources/../../tray/resources/config.h"
--- a/widgets/settings/settings.cpp
+++ b/widgets/settings/settings.cpp
@ -3,13 +3,13 @@
 #include "../misc/syncthingkiller.h"
 #include "../misc/syncthinglauncher.h"

-#include "../../connector/qstringhash.h"
-#include "../../connector/syncthingconnection.h"
-#include "../../connector/syncthingconnectionsettings.h"
-#include "../../connector/syncthingnotifier.h"
-#include "../../connector/syncthingprocess.h"
+#include <syncthingconnector/qstringhash.h>
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/syncthingconnectionsettings.h>
+#include <syncthingconnector/syncthingnotifier.h>
+#include <syncthingconnector/syncthingprocess.h>
 #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
-#include "../../connector/syncthingservice.h"
+#include <syncthingconnector/syncthingservice.h>
 #endif

 // use meta-data of syncthingtray application here
--- a/widgets/settings/settings.h
+++ b/widgets/settings/settings.h
@ -1,9 +1,9 @@
 #ifndef SETTINGS_H
 #define SETTINGS_H

-#include "../../connector/syncthingconnectionsettings.h"
+#include <syncthingconnector/syncthingconnectionsettings.h>
 #include "../../libsyncthing/interface.h"
-#include "../../model/syncthingicons.h"
+#include <syncthingmodel/syncthingicons.h>
 #include "../global.h"

 #include <qtutilities/settingsdialog/qtsettings.h>
--- a/widgets/settings/settingsdialog.cpp
+++ b/widgets/settings/settingsdialog.cpp
@ -2,15 +2,15 @@

 #include "../misc/syncthinglauncher.h"

-#include "../../connector/syncthingconfig.h"
-#include "../../connector/syncthingconnection.h"
-#include "../../connector/syncthingprocess.h"
-#include "../../connector/utils.h"
-#include "../../model/syncthingstatuscomputionmodel.h"
+#include <syncthingconnector/syncthingconfig.h>
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/syncthingprocess.h>
+#include <syncthingconnector/utils.h>
+#include <syncthingmodel/syncthingstatuscomputionmodel.h>
 #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
-#include "../../connector/syncthingservice.h"
-#include "../../model/colors.h"
-#include "../../model/syncthingicons.h"
+#include <syncthingconnector/syncthingservice.h>
+#include <syncthingmodel/colors.h>
+#include <syncthingmodel/syncthingicons.h>
 #endif

 #include "ui_appearanceoptionpage.h"
--- a/widgets/settings/settingsdialog.h
+++ b/widgets/settings/settingsdialog.h
@ -5,7 +5,7 @@

 #include "../webview/webviewdefs.h"

-#include "../../model/syncthingicons.h"
+#include <syncthingmodel/syncthingicons.h>

 #include <qtutilities/settingsdialog/optionpage.h>
 #include <qtutilities/settingsdialog/qtsettings.h>
--- a/widgets/webview/webpage.cpp
+++ b/widgets/webview/webpage.cpp
@ -4,7 +4,7 @@

 #include "../settings/settings.h"

-#include "../../connector/syncthingconnection.h"
+#include <syncthingconnector/syncthingconnection.h>

 #include "resources/config.h"

--- a/widgets/webview/webviewinterceptor.cpp
+++ b/widgets/webview/webviewinterceptor.cpp
@ -1,7 +1,7 @@
 #ifdef SYNCTHINGWIDGETS_USE_WEBENGINE
 #include "./webviewinterceptor.h"

-#include "../../connector/syncthingconnectionsettings.h"
+#include <syncthingconnector/syncthingconnectionsettings.h>

 #include <QWebEngineProfile>
 #include <QWebEngineUrlRequestInterceptor>