jami test update

This commit is contained in:
ace
2026-02-27 18:08:19 +03:00
parent 5db1b4a362
commit cabd3d8bfa
37 changed files with 13031 additions and 66 deletions

View File

@@ -1,20 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c046b597..89c64b95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,14 +100,7 @@ if(NOT WIN32)
endif()
# qwindowkit (frameless window)
-add_fetch_content(
- TARGET qwindowkit
- URL https://github.com/stdware/qwindowkit.git
- BRANCH 758b00cb6c2d924be3a1ea137ec366dc33a5132d
- PATCHES ${QWINDOWKIT_PATCHES}
- OPTIONS ${QWINDOWKIT_OPTIONS}
-)
-list(APPEND CLIENT_INCLUDE_DIRS ${QWindowKit_BINARY_DIR}/include)
+find_package(QWindowKit)
list(APPEND CLIENT_LIBS QWindowKit::Quick)
# If ENABLE_CRASHREPORTS is enabled, we will use crashpad_cmake for now.

View File

@@ -0,0 +1,31 @@
diff --git a/src/app/qrcodescannermodel.cpp b/src/app/qrcodescannermodel.cpp
index cea49eab..aac3ea35 100644
--- a/src/app/qrcodescannermodel.cpp
+++ b/src/app/qrcodescannermodel.cpp
@@ -17,9 +17,8 @@
#include "qrcodescannermodel.h"
-#include <Barcode.h>
-#include <MultiFormatReader.h>
-#include <ReadBarcode.h>
+#include <ZXing/Barcode.h>
+#include <ZXing/ReadBarcode.h>
#include <QDebug>
diff --git a/src/app/utils.cpp b/src/app/utils.cpp
index b02a21e5..c2ddb383 100644
--- a/src/app/utils.cpp
+++ b/src/app/utils.cpp
@@ -47,8 +47,8 @@
#include <windows.h>
#endif
-#include <BitMatrix.h>
-#include <MultiFormatWriter.h>
+#include <ZXing/BitMatrix.h>
+#include <ZXing/MultiFormatWriter.h>
// Removes the given argument from the command line arguments, and invokes the callback
// function with the removed argument if it was found.