libcdoc

.github/workflows/build.yml

@@ -5,13 +5,13 @@ permissions:
 env:
   BUILD_NUMBER: ${{ github.run_number }}
   CMAKE_BUILD_PARALLEL_LEVEL: 4
-  UBUNTU_DEPS: ./libdigidocpp-pkg/*.deb cmake libldap2-dev gettext libpcsclite-dev libssl-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libflatbuffers-dev zlib1g-dev
+  UBUNTU_DEPS: ./libdigidocpp-pkg/*.deb cmake libldap2-dev gettext libpcsclite-dev libssl-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libflatbuffers-dev libxml2-dev zlib1g-dev
 jobs:
   macos:
     name: Build on macOS
     runs-on: macos-latest
     env:
-      MACOSX_DEPLOYMENT_TARGET: 13.0
+      MACOSX_DEPLOYMENT_TARGET: 13.3
       LIBS_PATH: ${{ github.workspace }}/cache
     steps:
     - &Checkout
@@ -186,7 +186,8 @@ jobs:
         VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}/vcpkg_cache,readwrite
       run: |
         cmake "-GNinja" -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo `
-          -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
+          -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake `
+          -DVCPKG_MANIFEST_DIR=${{ github.workspace }}/client/libcdoc
         cmake --build build --target msi
         cmake --build build --target msishellext
         cmake --build build --target appx

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "common"]
 	path = common
 	url = ../qt-common
+[submodule "client/libcdoc"]
+	path = client/libcdoc
+	url = ../libcdoc

CMakeLists.txt

@@ -47,8 +47,6 @@ find_package(libdigidocpp 4.2.0 REQUIRED HINTS /Library)
 message("-- Found libdigidocpp: ${libdigidocpp_DIR} (found version \"${libdigidocpp_VERSION}\")")
 find_package(LDAP REQUIRED)
 find_package(Qt6 6.2.0 REQUIRED COMPONENTS Core Widgets Network PrintSupport SvgWidgets LinguistTools)
-find_package(FlatBuffers CONFIG REQUIRED NAMES FlatBuffers Flatbuffers)
-find_package(ZLIB REQUIRED)
 
 if(APPLE)
     add_subdirectory(extensions/DigiDocQL)

README.md

@@ -64,7 +64,7 @@
 3. Configure
 
         cmake -B build -S . \
-          -DCMAKE_PREFIX_PATH=~/cmake_builds/Qt-6.6.3-OpenSSL
+          -DCMAKE_PREFIX_PATH=~/cmake_builds/Qt-6.10.2-OpenSSL
           -DOPENSSL_ROOT_DIR=~/cmake_build/OpenSSL \
           -DLDAP_ROOT=~/cmake_build/OpenLDAP \
           -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
@@ -81,10 +81,11 @@
 ### Windows
 
 1. Install dependencies from
-    * [Visual Studio Community 2019](https://www.visualstudio.com/downloads/)
+    * [Visual Studio Community 2022](https://www.visualstudio.com/downloads/)
     * [http://www.cmake.org](http://www.cmake.org)
     * [http://qt-project.org](http://qt-project.org)
     * [libdigidocpp-*.msi](https://github.com/open-eid/libdigidocpp/releases)
+    * [vcpkg](https://vcpkg.io/)
 
 2. Fetch the source
 
@@ -93,7 +94,10 @@
 
 3. Configure
 
-        cmake -G"NMAKE Makefiles" -DCMAKE_PREFIX_PATH=C:\Qt\6.6.3\msvc2019_x64  -DLibDigiDocpp_ROOT="C:\Program Files (x86)\libdigidocpp" -B build -S .
+        cmake -G"NMAKE Makefiles" -B build -S . `
+          -DCMAKE_PREFIX_PATH=C:\Qt\6.10.2\msvc2022_x64 `
+          -DLibDigiDocpp_ROOT="C:\Program Files (x86)\libdigidocpp" `
+          -DVCPKG_MANIFEST_DIR=client/libcdoc
 
 4. Build
 

client/Application.cpp

@@ -23,6 +23,7 @@
 
 #include "Common.h"
 #include "Configuration.h"
+#include "CDocSupport.h"
 #include "MainWindow.h"
 #include "QSigner.h"
 #include "QSmartCard.h"
@@ -471,6 +472,7 @@ Application::Application( int &argc, char **argv )
 		setQuitOnLastWindowClosed( true );
 		return;
 	}
+	DDCDocLogger::setUpLogger();
 
 	QMetaObject::invokeMethod(this, [this] {
 #ifdef Q_OS_MAC