From 34685859f500a908cff42bfbbda246d8cc2a3f17 Mon Sep 17 00:00:00 2001 From: Guilherme Silva <626206+guihkx@users.noreply.github.com> Date: Fri, 8 Dec 2023 03:14:41 -0300 Subject: [PATCH] Remove remaining references to CMake's old USE_WEBENGINE option (#1243) That option was renamed to NO_LITE in v4.6.0. --- CMakeLists.txt | 4 ---- docs/source/contrib/compile.md | 2 +- docs/source/downloads.md | 4 ++-- resources/desktop/CMakeLists.txt | 2 +- src/librssguard/gui/newspaperpreviewer.cpp | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4655b39cf..e5795ec4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,10 +126,6 @@ option(ENABLE_COMPRESSED_SITEMAP "Enable support for gzip-compressed sitemap fee option(ENABLE_MEDIAPLAYER_QTMULTIMEDIA "Enable built-in media player. Requires QtMultimedia FFMPEG plugin." OFF) option(ENABLE_MEDIAPLAYER_LIBMPV "Enable built-in media player. Requires libmpv library." ON) -if(USE_WEBENGINE) - set(NO_LITE ON) -endif() - # Import Qt libraries. set(QT6_MIN_VERSION 6.3.0) set(QT5_MIN_VERSION 5.12.0) diff --git a/docs/source/contrib/compile.md b/docs/source/contrib/compile.md index 5c77f75e4..0b10ebec7 100644 --- a/docs/source/contrib/compile.md +++ b/docs/source/contrib/compile.md @@ -9,7 +9,7 @@ Here's a quick example of how to build it on Linux: mkdir build-dir # Configure the project to build using Qt 6, and disable built-in web browser support -cmake -B build-dir -S . -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_WITH_QT6=ON -DUSE_WEBENGINE=OFF +cmake -B build-dir -S . -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_WITH_QT6=ON -DNO_LITE=OFF # Compile it (in parallel mode) cmake --build build-dir -j$(nproc) diff --git a/docs/source/downloads.md b/docs/source/downloads.md index b4dc3c074..9d45f41bd 100644 --- a/docs/source/downloads.md +++ b/docs/source/downloads.md @@ -5,7 +5,7 @@ Official place to download RSS Guard is at [Github Releases page](https://github RSS Guard is also available in [repositories of many Linux distributions](https://repology.org/project/rssguard/versions), and via [Flathub](https://flathub.org/apps/search?q=rssguard). The are two different [flavors](#features/browseradblock): -* Regular: Includes an (almost) full-blown integrated web browser (built with `-DUSE_WEBENGINE=ON`). -* Lite: Includes simpler, safer (and less memory hungry integrated web browser (built with `-DUSE_WEBENGINE=OFF`). +* Regular: Includes an (almost) full-blown integrated web browser (built with `-NO_LITE=ON`). +* Lite: Includes simpler, safer (and less memory hungry integrated web browser (built with `-NO_LITE=OFF`). I highly recommend to download RSS Guard only from trusted sources. \ No newline at end of file diff --git a/resources/desktop/CMakeLists.txt b/resources/desktop/CMakeLists.txt index 632f760ac..813481450 100644 --- a/resources/desktop/CMakeLists.txt +++ b/resources/desktop/CMakeLists.txt @@ -3,7 +3,7 @@ set(APPDATA_NAME_LITE "${APP_NAME} Lite") set(APPDATA_SUMMARY_REGULAR "Simple, yet powerful news feed reader") set(APPDATA_SUMMARY_LITE "${APPDATA_SUMMARY_REGULAR} (no built-in web browser)") -if(USE_WEBENGINE) +if(NO_LITE) set(APPDATA_NAME "${APPDATA_NAME_REGULAR}") set(APPDATA_SUMMARY "${APPDATA_SUMMARY_REGULAR}") else() diff --git a/src/librssguard/gui/newspaperpreviewer.cpp b/src/librssguard/gui/newspaperpreviewer.cpp index 5a3b9cee8..d3f7ef318 100644 --- a/src/librssguard/gui/newspaperpreviewer.cpp +++ b/src/librssguard/gui/newspaperpreviewer.cpp @@ -16,7 +16,7 @@ NewspaperPreviewer::NewspaperPreviewer(int msg_height, RootItem* root, QList