diff --git a/connector/CMakeLists.txt b/connector/CMakeLists.txt index 2722bca..cef2be3 100644 --- a/connector/CMakeLists.txt +++ b/connector/CMakeLists.txt @@ -27,9 +27,10 @@ set(SRC_FILES find_package(c++utilities 4.0.0 REQUIRED) use_cpp_utilities() -# find qtutilities (only header used) +# find qtutilities (only headers and CMake modules used) find_package(qtutilities 5.0.0 REQUIRED) include_directories(BEFORE SYSTEM ${QT_UTILITIES_INCLUDE_DIRS}) +list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_MODULE_DIRS}) # link also explicitely against the following Qt 5 modules list(APPEND ADDITIONAL_QT_MODULES Network) diff --git a/connector/syncthingconnection.h b/connector/syncthingconnection.h index 0e10ad9..21f746d 100644 --- a/connector/syncthingconnection.h +++ b/connector/syncthingconnection.h @@ -24,7 +24,7 @@ namespace Data { struct SyncthingConnectionSettings; -QNetworkAccessManager &networkAccessManager(); +QNetworkAccessManager LIB_SYNCTHING_CONNECTOR_EXPORT &networkAccessManager(); enum class SyncthingStatus { diff --git a/connector/syncthingprocess.h b/connector/syncthingprocess.h index 88a3b76..64db467 100644 --- a/connector/syncthingprocess.h +++ b/connector/syncthingprocess.h @@ -25,7 +25,7 @@ private: QString m_cmd; }; -SyncthingProcess &syncthingProcess(); +SyncthingProcess LIB_SYNCTHING_CONNECTOR_EXPORT &syncthingProcess(); } // namespace Data diff --git a/model/CMakeLists.txt b/model/CMakeLists.txt index 9995b5a..c8e17d5 100644 --- a/model/CMakeLists.txt +++ b/model/CMakeLists.txt @@ -23,6 +23,10 @@ set(SRC_FILES find_package(c++utilities 4.0.0 REQUIRED) use_cpp_utilities() +# find qtutilities (only CMake modules used) +find_package(qtutilities 5.0.0 REQUIRED) +list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_MODULE_DIRS}) + # find backend libraries find_package(syncthingconnector ${META_APP_VERSION} REQUIRED) use_syncthingconnector() diff --git a/tray/application/main.cpp b/tray/application/main.cpp index 9014bd1..567b54d 100644 --- a/tray/application/main.cpp +++ b/tray/application/main.cpp @@ -118,7 +118,7 @@ int runApplication(int argc, const char *const *argv) return res; } else { if(!TrayWidget::instances().empty() && showWebUi.isPresent()) { - // if --webui is present don't create a new tray icon, just show the web UI one of the present ones + // if --webui is present don't create a new tray icon, just show the web UI of the present one TrayWidget::instances().front()->showWebUi(); } else { return initSyncthingTray(windowedArg.isPresent(), waitForTrayArg.isPresent());