[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-7' - configure.ac cui/source

[Caolán McNamara (via logerrit)]

 configure.ac                       |    2 +-
 cui/source/inc/QrCodeGenDialog.hxx |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 50d49d230d740d8422d17fbb7d7f4f9ce9889a1a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Sep 23 19:32:33 2020 +0100
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Mon Sep 28 10:06:22 2020 +0200

    fix disable qrcodegen option
    
    Change-Id: Ic554f01125653022987c70d03c8c9d86fe3f547a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103204
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Tested-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/configure.ac b/configure.ac
index 3795b74f2bce..a698490db23f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10080,7 +10080,7 @@ dnl ===================================================================
 dnl Check for system qrcodegen
 dnl ===================================================================
 AC_MSG_CHECKING([whether to use libqrcodegen])
-if test "$enable_libqrcodegen" = "no"; then
+if test "$enable_qrcodegen" = "no"; then
     AC_MSG_RESULT([no])
     ENABLE_QRCODEGEN=
     SYSTEM_QRCODEGEN=
diff --git a/cui/source/inc/QrCodeGenDialog.hxx b/cui/source/inc/QrCodeGenDialog.hxx
index a3ca38d48d4a..741253f7687d 100644
--- a/cui/source/inc/QrCodeGenDialog.hxx
+++ b/cui/source/inc/QrCodeGenDialog.hxx
@@ -9,6 +9,8 @@
 #ifndef INCLUDED_CUI_INC_QRCODEGENDIALOG_HXX
 #define INCLUDED_CUI_INC_QRCODEGENDIALOG_HXX
 
+#include <config_qrcodegen.h>
+
 #include <vcl/weld.hxx>
 
 #include <com/sun/star/frame/XModel.hpp>