lang sync

CMakeLists.txt

@@ -19,6 +19,7 @@
 #     cmake --install .
 #
 # Variables:
+#   BUILD_WITH_QT6 - Build either with Qt 6 or Qt 5.
 #   USE_WEBENGINE - if specified, then QtWebEngine module for internal web browser is used.
 #                   Otherwise simple text component is used and some features will be disabled.
 #                   Default value is "false". If QtWebEngine is installed during compilation, then
@@ -32,7 +33,7 @@
 #   - cmake 3.9.0 or newer is required,
 #   - if you wish to make packages for Windows, then you must initialize all submodules
 #     within repository before compilation,
-#   - C++ 11/17 is required.
+#   - C++ 17 is required.
 #
 # Building on OS/2:
 #   RSS Guard can run on OS/2 and if you want to compile it by yourself, you need to make sure that
@@ -109,6 +110,9 @@ option(FORCE_COLORED_OUTPUT "Always produce ANSI-colored output (GCC/Clang only)
 option(REVISION_FROM_GIT "Get revision using `git rev-parse`" ON)
 
 # Import Qt libraries.
+set(QT6_MIN_VERSION 6.2.3)
+set(QT5_MIN_VERSION 5.9.0)
+
 set(QT_COMPONENTS
   Core
   Gui
@@ -135,10 +139,10 @@ endif()
 
 if(BUILD_WITH_QT6)
   find_package(QT NAMES Qt6)
-  find_package(Qt6 COMPONENTS ${QT_COMPONENTS} Core5Compat REQUIRED)
+  find_package(Qt6 ${QT6_MIN_VERSION} COMPONENTS ${QT_COMPONENTS} Core5Compat REQUIRED)
 else()
   find_package(QT NAMES Qt5)
-  find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED)
+  find_package(Qt5 ${QT5_MIN_VERSION} COMPONENTS ${QT_COMPONENTS} REQUIRED)
 
   if(Qt5Core_VERSION VERSION_LESS 5.15.0)
     # Compatibility macros.

localization/CMakeLists.txt

@@ -1,19 +1,21 @@
-# Collect all .ts files.
+if(UPDATE_TRANSLATIONS)
+  # Regenerate "en" .ts file.
+  file(GLOB_RECURSE ALL_SOURCES
+    "${CMAKE_SOURCE_DIR}/src/librssguard/*.cpp")
+
+  qt_add_lupdate(rssguard
+    TS_FILES "${CMAKE_CURRENT_SOURCE_DIR}/rssguard_en.ts"
+    SOURCES ${ALL_SOURCES}
+    OPTIONS "-no-obsolete")
+endif()
+
+# Collect all .ts files and generate .qm files.
 FILE(GLOB TS_FILES  ${CMAKE_CURRENT_SOURCE_DIR}/*.ts)
 
 set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}")
-
-# Update .ts file and/or just generate .qm files.
-if(UPDATE_TRANSLATIONS)
-  qt_create_translation(QM_FILES
-    "${CMAKE_SOURCE_DIR}/src" ${TS_FILES}
-    OPTIONS "-no-obsolete"
-  )
-else()
-  qt_add_translation(QM_FILES
+qt_add_translation(QM_FILES
   ${TS_FILES}
   OPTIONS "-compress"
-  )
-endif()
+)
 
 add_custom_target(update_qm DEPENDS ${QM_FILES})

resources/desktop/com.github.rssguard.appdata.xml

@@ -26,7 +26,7 @@
   <url type="donation">https://github.com/sponsors/martinrotter</url>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="4.1.2" date="2022-02-11"/>
+    <release version="4.1.2" date="2022-02-14"/>
   </releases>
   <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">none</content_attribute>