From 0b5fb1493151a7f0250121f2a0b7cae6358f52d5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 4 Sep 2020 01:13:46 +0200 Subject: [PATCH] Remove overspecification of Qt version in documentation and comments --- README.md | 14 +++++++------- connector/CMakeLists.txt | 2 +- model/CMakeLists.txt | 2 +- plasmoid/lib/CMakeLists.txt | 2 +- testhelper/CMakeLists.txt | 2 +- tray/CMakeLists.txt | 2 +- tray/resources/body.appdata.xml | 2 +- widgets/CMakeLists.txt | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index ac81daa..1d25540 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # [Syncthing](https://github.com/syncthing/syncthing) Tray -* Qt 5-based tray application +* Qt-based tray application * [Dolphin](https://www.kde.org/applications/system/dolphin)/[Plasma](https://www.kde.org/plasma-desktop) integration * command-line interface @@ -18,7 +18,7 @@ distributors. For a list with links, checkout the *Download* section of this doc GitHub only contains a fraction of the available options. ## Supported platforms -* Designed to work under any desktop environment supported by Qt 5 with tray icon support +* Designed to work under any desktop environment supported by Qt with tray icon support * No desktop environment specific libraries required (only for optional features/integrations) * Tested under * X Window System @@ -36,7 +36,7 @@ GitHub only contains a fraction of the available options. * other desktop environments * for Qt Widgets based version see note below * besides, the Qt Widgets based version would only work if the platform integration plugin - used for Qt 5 applications uses the D-Bus protocol (or whatever is supported by your system + used for Qt applications uses the D-Bus protocol (or whatever is supported by your system tray) to show the tray icon * Windows 10 * macOS 10.14 Mojave @@ -235,7 +235,7 @@ For building this straight, see the section below. There's also documentation ab can be passed to CMake to influence the build. ### Further dependencies -The following Qt 5 modules are requried (version 5.6 or newer): core network dbus gui widgets svg webenginewidgets/webkitwidgets +The following Qt modules are requried (version 5.6 or newer): core network dbus gui widgets svg webenginewidgets/webkitwidgets It is recommended to use at least Qt 5.14 to avoid limitations in previous versions (see *Known bugs* section). @@ -244,7 +244,7 @@ The built-in web view and therefore the modules webenginewidgets/webkitwidgets a To build the plugin for Dolphin integration KIO is also requried. Additionally, the Dolphin plugin requires Qt 5.8 or newer. To skip building the plugin, add `-DNO_FILE_ITEM_ACTION_PLUGIN:BOOL=ON` to the CMake arguments. -To build the Plasmoid for the Plasma 5 desktop, the Qt 5 module QML and the KF5 module +To build the Plasmoid for the Plasma 5 desktop, the Qt module QML and the KF5 module Plasma are required as well. Additionally, the Plasmoid requires Qt 5.8 or newer. To skip building the Plasmoid, add `-DNO_PLASMOID:BOOL=ON` to the CMake arguments. @@ -259,7 +259,7 @@ to systemd in any case. Building the testsuite requires CppUnit and Qt 5.8 or higher. ### Building this straight -0. Install (preferably the latest version of) the CGG toolchain or Clang, the required Qt 5 modules and CMake. +0. Install (preferably the latest version of) the CGG toolchain or Clang, the required Qt modules and CMake. 1. Get the sources. For the lastest version from Git clone the following repositories: ``` cd $SOURCES @@ -315,7 +315,7 @@ The files for the Dolphin integration look like this under Tumbleweed: The directory the `*.so` file needs to be installed to seems to differ from distribution to distribution. The right directory for your distribution can be queried from qmake using -`qmake-qt5 -query QT_INSTALL_PLUGINS`. In doubt, just look where other Qt 5 plugins are stored. +`qmake-qt5 -query QT_INSTALL_PLUGINS`. In doubt, just look where other Qt plugins are stored. Actually the build system should be able to do that query automatically. It is also possible to specify the directory manually, e.g. for Tumbleweed one would add diff --git a/connector/CMakeLists.txt b/connector/CMakeLists.txt index 51f730a..2d6356c 100644 --- a/connector/CMakeLists.txt +++ b/connector/CMakeLists.txt @@ -49,7 +49,7 @@ find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX} 6.3.0 REQUIRED) list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_MODULE_DIRS}) list(APPEND PUBLIC_INCLUDE_DIRS ${QT_UTILITIES_INCLUDE_DIRS}) -# link also explicitely against the following Qt 5 modules +# link also explicitely against the following Qt modules list(APPEND ADDITIONAL_QT_MODULES Network) set(META_PUBLIC_QT_MODULES Core ${ADDITIONAL_QT_MODULES}) diff --git a/model/CMakeLists.txt b/model/CMakeLists.txt index f874ecb..aeeed8d 100644 --- a/model/CMakeLists.txt +++ b/model/CMakeLists.txt @@ -43,7 +43,7 @@ use_qt_utilities() find_package(syncthingconnector ${META_APP_VERSION} REQUIRED) use_syncthingconnector(VISIBILITY PUBLIC) -# link also explicitely against the following Qt 5 modules +# link also explicitely against the following Qt modules list(APPEND ADDITIONAL_QT_MODULES Network Gui Widgets Svg) # include modules to apply configuration diff --git a/plasmoid/lib/CMakeLists.txt b/plasmoid/lib/CMakeLists.txt index 54611c5..39553b2 100644 --- a/plasmoid/lib/CMakeLists.txt +++ b/plasmoid/lib/CMakeLists.txt @@ -28,7 +28,7 @@ use_syncthingmodel() find_package(syncthingwidgets ${META_APP_VERSION} REQUIRED) use_syncthingwidgets() -# link also explicitely against the following Qt 5 modules +# link also explicitely against the following Qt modules list(APPEND ADDITIONAL_QT_MODULES Network Qml) list(APPEND ADDITIONAL_KF_MODULES Plasma) diff --git a/testhelper/CMakeLists.txt b/testhelper/CMakeLists.txt index c4a5a7b..462fb97 100644 --- a/testhelper/CMakeLists.txt +++ b/testhelper/CMakeLists.txt @@ -35,7 +35,7 @@ list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_MODULE_DIRS}) find_package(syncthingconnector ${META_APP_VERSION} REQUIRED) use_syncthingconnector() -# link also explicitely against the following Qt 5 modules +# link also explicitely against the following Qt modules list(APPEND ADDITIONAL_QT_MODULES Network) # include modules to apply configuration diff --git a/tray/CMakeLists.txt b/tray/CMakeLists.txt index 5ed0c47..eafd081 100644 --- a/tray/CMakeLists.txt +++ b/tray/CMakeLists.txt @@ -109,7 +109,7 @@ use_syncthingmodel() find_package(syncthingwidgets ${META_APP_VERSION} REQUIRED) use_syncthingwidgets() -# link also explicitely against the following Qt 5 modules +# link also explicitely against the following Qt modules list(APPEND ADDITIONAL_QT_MODULES Network) # apply basic configuration diff --git a/tray/resources/body.appdata.xml b/tray/resources/body.appdata.xml index 6ec910e..e5b0ccf 100644 --- a/tray/resources/body.appdata.xml +++ b/tray/resources/body.appdata.xml @@ -1,6 +1,6 @@