Blob Blame History Raw
From 5875af20a84ccf4a8a0fd22989d3bb520b8320ab Mon Sep 17 00:00:00 2001
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
index 1e4724a..6d6f4ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10034,7 +10034,7 @@ if test "$with_system_qrcodegen" = "yes"; then
     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.) ], [])
diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx
index d936219..e0fc4fc 100644
--- a/cui/source/dialogs/QrCodeGenDialog.cxx
+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
@@ -17,7 +17,7 @@
 #include <sal/log.hxx>
 
 #if defined(SYSTEM_QRCODEGEN)
-#include <qrcodegen/QrCode.hpp>
+#include <qrcodegencpp/QrCode.hpp>
 #else
 #include <QrCode.hpp>
 #endif
-- 
2.24.1