2020-10-30 11:27:00 +00:00
|
|
|
From 2f11e4247b6332b06a5b23c33207fa10767244a6 Mon Sep 17 00:00:00 2001
|
2020-10-15 15:08:32 +00:00
|
|
|
From: Thierry Vignaud <thierry.vignaud@gmail.com>
|
|
|
|
|
Date: Thu, 30 Jan 2020 11:19:20 +0000
|
|
|
|
|
Subject: [PATCH] fix detecting qrcodegen
|
|
|
|
|
|
|
|
|
|
Change-Id: Ib945b57420083489273cefc5655eb50932b5a3f8
|
|
|
|
|
---
|
|
|
|
|
configure.ac | 2 +-
|
|
|
|
|
cui/source/dialogs/QrCodeGenDialog.cxx | 2 +-
|
|
|
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
2020-10-30 11:27:00 +00:00
|
|
|
index 5a14369..ebd1b55 100644
|
2020-10-15 15:08:32 +00:00
|
|
|
--- a/configure.ac
|
|
|
|
|
+++ b/configure.ac
|
2020-10-30 11:27:00 +00:00
|
|
|
@@ -10250,7 +10250,7 @@ else
|
|
|
|
|
AC_MSG_RESULT([external])
|
|
|
|
|
SYSTEM_QRCODEGEN=TRUE
|
|
|
|
|
AC_LANG_PUSH([C++])
|
|
|
|
|
- AC_CHECK_HEADER(qrcodegen/QrCode.hpp, [],
|
|
|
|
|
+ AC_CHECK_HEADER(qrcodegencpp/QrCode.hpp, [],
|
|
|
|
|
[AC_MSG_ERROR(qrcodegen headers not found.)], [#include <stdexcept>])
|
|
|
|
|
AC_CHECK_LIB([qrcodegencpp], [main], [:],
|
|
|
|
|
[ AC_MSG_ERROR(qrcodegen C++ library not found.) ], [])
|
2020-10-15 15:08:32 +00:00
|
|
|
diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx
|
2020-10-30 11:27:00 +00:00
|
|
|
index 7f3f6a8..b79a356 100644
|
2020-10-15 15:08:32 +00:00
|
|
|
--- a/cui/source/dialogs/QrCodeGenDialog.cxx
|
|
|
|
|
+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
|
2020-10-30 11:27:00 +00:00
|
|
|
@@ -19,7 +19,7 @@
|
2020-10-15 15:08:32 +00:00
|
|
|
|
2020-10-30 11:27:00 +00:00
|
|
|
#if ENABLE_QRCODEGEN
|
2020-10-15 15:08:32 +00:00
|
|
|
#if defined(SYSTEM_QRCODEGEN)
|
|
|
|
|
-#include <qrcodegen/QrCode.hpp>
|
|
|
|
|
+#include <qrcodegencpp/QrCode.hpp>
|
|
|
|
|
#else
|
|
|
|
|
#include <QrCode.hpp>
|
|
|
|
|
#endif
|
|
|
|
|
--
|
|
|
|
|
2.26.2
|
|
|
|
|
|
