blob: aaa8bb7ae385baafaee8f6c6e45f910af07d21f5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
From: Pavel Sobolev <contact@paveloom.dev>
Subject: [PATCH] Use system `quirc`.
Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
--- a/3rdparty/QrDecoder.cpp
+++ b/3rdparty/QrDecoder.cpp
@@ -1,10 +1,8 @@
#include "QrDecoder.h"
-#include "quirc/quirc.h"
+#include <quirc.h>
#include <qdebug.h>
-#include "quirc/quirc_internal.h"
-
QrDecoder::QrDecoder()
: m_qr(quirc_new())
{
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,11 +85,6 @@ set(PROJECT_SOURCES
3rdparty/qv2ray/v2/ui/widgets/speedchart/SpeedWidget.hpp
3rdparty/qv2ray/v2/proxy/QvProxyConfigurator.cpp
- 3rdparty/quirc/decode.c
- 3rdparty/quirc/identify.c
- 3rdparty/quirc/quirc.c
- 3rdparty/quirc/version_db.c
-
3rdparty/SQLiteCpp/src/Backup.cpp
3rdparty/SQLiteCpp/src/Column.cpp
3rdparty/SQLiteCpp/src/Database.cpp
@@ -390,6 +385,7 @@ target_link_libraries(Throne PRIVATE
Threads::Threads
${NKR_EXTERNAL_TARGETS}
${PLATFORM_LIBRARIES}
+ quirc
)
qt_finalize_executable(Throne)
|
