[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - configure.ac cui/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Mon Sep 28 14:57:24 UTC 2020
configure.ac | 2 +-
cui/source/inc/QrCodeGenDialog.hxx | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 956513a6990f59b8bcf2ed7e12a6c8fe57bb13f5
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Sep 23 19:32:33 2020 +0100
Commit: Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Mon Sep 28 16:56:46 2020 +0200
fix disable qrcodegen option
Change-Id: Ic554f01125653022987c70d03c8c9d86fe3f547a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103272
Tested-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
diff --git a/configure.ac b/configure.ac
index 808515abe86b..a62c131a6d0e 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>
More information about the Libreoffice-commits
mailing list