Update version number

WE2-1141

Signed-off-by: Raul Metsma <[email protected]>

Author: metsma

.github/workflows/cmake-linux-codeql.yml

@@ -20,25 +20,25 @@ jobs:
       with:
         submodules: recursive
 
-    - uses: github/codeql-action/init@v3
+    - uses: github/codeql-action/init@v4
       with:
         languages: cpp
         queries: +security-and-quality
 
-    - uses: github/codeql-action/autobuild@v3
+    - uses: github/codeql-action/autobuild@v4
 
-    - uses: github/codeql-action/analyze@v3
+    - uses: github/codeql-action/analyze@v4
       with:
         upload: False
         output: sarif-results
 
-    - uses: advanced-security/filter-sarif@develop
+    - uses: advanced-security/filter-sarif@v1
       with:
         patterns: |
           -**/*autogen*/**
         input: sarif-results/cpp.sarif
         output: sarif-results/cpp.sarif
 
-    - uses: github/codeql-action/upload-sarif@v3
+    - uses: github/codeql-action/upload-sarif@v4
       with:
         sarif_file: sarif-results/cpp.sarif

.github/workflows/cmake-linux-fedora.yml

@@ -14,7 +14,7 @@ jobs:
     container: fedora:${{ matrix.container }}
     strategy:
       matrix:
-        container: [41, 42, 43]
+        container: [42, 43]
 
     steps:
       - name: Install Deps

.github/workflows/cmake-macos.yml

@@ -64,7 +64,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: 6.9.3
+          version: 6.10.0
           arch: clang_64
 
       - name: Configure

CMakeLists.txt

@@ -11,7 +11,10 @@ elseif($ENV{CI_PIPELINE_IID})
 else()
     set(BUILD_NUMBER 0)
 endif()
-project(web-eid VERSION 2.8.0.${BUILD_NUMBER})
+project(web-eid VERSION 2.9.0.${BUILD_NUMBER}
+    DESCRIPTION "Web eID browser extension helper application"
+    HOMEPAGE_URL https://github.com/web-eid/web-eid-app
+)
 
 set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION_TWEAK})

README.md

@@ -266,13 +266,13 @@ https://github.com/mrts/docker-qt-cmake-gtest-valgrind-ubuntu/blob/master/Docker
 
 ### Windows
 
-- Download Visual Studio 2019 community installer from https://visualstudio.microsoft.com/ and install _Desktop C++ Development_
+- Download Visual Studio 2022 community installer from https://visualstudio.microsoft.com/ and install _Desktop C++ Development_
 - Install WIX toolset
 
-      dotnet tool install --global wix --version 5.0.0
-      wix extension -g add WixToolset.UI.wixext/5.0.0
-      wix extension -g add WixToolset.Util.wixext/5.0.0
-      wix extension -g add WixToolset.Bal.wixext/5.0.0
+    dotnet tool install --global wix --version 6.0.2
+    wix extension -g add WixToolset.UI.wixext/6.0.2
+    wix extension -g add WixToolset.Util.wixext/6.0.2
+    wix extension -g add WixToolset.Bal.wixext/6.0.2
 
 - Download and install Git for Windows from https://git-scm.com/download/win
 - Download and install CMake from https://cmake.org/download/
@@ -283,12 +283,8 @@ https://github.com/mrts/docker-qt-cmake-gtest-valgrind-ubuntu/blob/master/Docker
       .\bootstrap-vcpkg.bat
       .\vcpkg integrate install
 
-- Install _Google Test_ and _OpenSSL_ with _vcpkg_:
-
-      .\vcpkg install --recurse --triplet x64-windows --clean-after-build gtest openssl
-
 - Install _Qt_ with the official [_Qt Online Installer_](https://www.qt.io/download-qt-installer),
-  choose _Custom installation > Qt 6.6.3 > MSVC 2019 64-bit_.
+  choose _Custom installation > Qt 6.10.0 > MSVC 2022 64-bit_.
 
 ### macOS
 
@@ -303,7 +299,7 @@ https://github.com/mrts/docker-qt-cmake-gtest-valgrind-ubuntu/blob/master/Docker
 - Create symlink to _OpenSSL_ location and setup environment variables required
   by _CMake_:
 
-      export OPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1
+      export OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3.0
       export QT_DIR=/usr/local/opt/qt6/lib/cmake/Qt6
 
 ## Building and testing
@@ -320,7 +316,7 @@ Use _Powershell_ to run the following commands to build the project.
 
 - Set the _Qt_ installation directory variable:
 
-      $QT_ROOT = "C:\Qt\6.2.4\msvc2019_64"
+      $QT_ROOT = "C:\Qt\6.10.0\msvc2022_64"
 
 - Set the _vcpkg_ installation directory variable:
 
@@ -332,11 +328,11 @@ Use _Powershell_ to run the following commands to build the project.
 
 - Run _CMake_:
 
-Optionally, WIX Toolset v3 is required for the installer, and the WIX environment variable should be set for the installed target.
-
-      cmake "-DCMAKE_PREFIX_PATH=${QT_ROOT}" `
+      cmake -A x64 -B build -S .
+          "-DCMAKE_PREFIX_PATH=${QT_ROOT}" `
           "-DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" `
-          "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" -A x64 -B build -S .
+          "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" `
+          "-DVCPKG_MANIFEST_DIR=lib/libelectronic-id/.github"
 
 - Run the build and installer build:
 
@@ -353,9 +349,9 @@ Optionally, WIX Toolset v3 is required for the installer, and the WIX environmen
 
 ## Adding and updating translations
 
-You can use the free [Qt Linguist application](https://doc.qt.io/qt-5/qtlinguist-index.html)
+You can use the free [Qt Linguist application](https://doc.qt.io/qt-6/qtlinguist-index.html)
 to add and edit translations.
 
 Run the following command to update Qt Linguist TS files:
 
-      lupdate src/ -ts ./src/ui/translations/*.ts
+      cmake --build build --config ${BUILD_TYPE} --target update_translations

build.ps1

@@ -1,8 +1,10 @@
 param(
   [string]$cmake = "C:\Program Files\CMake\bin\cmake.exe",
   [string]$vcpkgroot = "C:\vcpkg",
-  [string]$qtdir = "C:\Qt\6.5.2\msvc2019_64"
+  [string]$qtdir = "C:\Qt\6.10.0\msvc2022_64",
+  [string]$buildtype = "RelWithDebInfo",
+  [string]$arch = "x64"
 )
 
-& $cmake -A x64 "-DCMAKE_TOOLCHAIN_FILE=$vcpkgroot\scripts\buildsystems\vcpkg.cmake" "-DQt6_DIR=$qtdir" -S . -B build
-& $cmake --build build
+& $cmake -S . -B build\windows -A $arch -DCMAKE_BUILD_TYPE=$buildtype "-DCMAKE_PREFIX_PATH=$qtdir" "-DCMAKE_TOOLCHAIN_FILE=$vcpkgroot\scripts\buildsystems\vcpkg.cmake" "-DVCPKG_MANIFEST_DIR=lib/libelectronic-id/.github"
+& $cmake --build build\windows --config $buildtype

src/ui/CMakeLists.txt

@@ -16,7 +16,11 @@ qt_add_resources(ui resources BASE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX / FILES
     ${FONTS}
 )
 file(GLOB TRANSLATIONS translations/*.ts)
-qt_add_translations(ui TS_FILES ${TRANSLATIONS} RESOURCE_PREFIX /translations)
+qt_add_translations(ui
+    TS_FILES ${TRANSLATIONS}
+    RESOURCE_PREFIX /translations
+    LUPDATE_OPTIONS -locations none
+)
 set_target_properties(ui PROPERTIES
     AUTORCC ON
     AUTOUIC ON

src/ui/translations/cs.ts

@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="cs_CZ">
+<context>
+    <name>Application</name>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>CertificateButton</name>
     <message>

src/ui/translations/de.ts

@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="de_DE">
+<context>
+    <name>Application</name>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>CertificateButton</name>
     <message>

src/ui/translations/en.ts

@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="en_US">
+<context>
+    <name>Application</name>
+    <message>
+        <source>&amp;File</source>
+        <translation>&amp;File</translation>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translation>&amp;About</translation>
+    </message>
+</context>
 <context>
     <name>CertificateButton</name>
     <message>