diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-07-25 11:11:41 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-07-25 14:53:18 +0200 |
| commit | 08eb6de1a274fce5d04c5fadcb4d87320414873c (patch) | |
| tree | 7a7e0920de513801d50510e79c30b0afe81a980e | |
| parent | e6bbfd641c6c65ebdebae92f2382689d3ea4a089 (diff) | |
external qrcodegen looks under qrcodegen
Change-Id: I01f06c30a52f5e4cdb5b4b6304072aa0f3a63aa8
Reviewed-on: https://gerrit.libreoffice.org/76291
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | RepositoryExternal.mk | 5 | ||||
| -rw-r--r-- | cui/source/dialogs/QrCodeGenDialog.cxx | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 021d9a7b650e..54ab1dbfdcc3 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -4160,8 +4160,9 @@ ifneq ($(SYSTEM_QRCODEGEN),) define gb_LinkTarget__use_qrcodegen $(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(QRCODEGEN_CFLAGS) \ + -DSYSTEM_QRCODEGEN \ + $$(INCLUDE) \ + $(QRCODEGEN_CFLAGS) \ ) $(call gb_LinkTarget_add_libs,$(1),$(QRCODEGEN_LIBS)) diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx index 628ada1df38b..14c9b18e9ab9 100644 --- a/cui/source/dialogs/QrCodeGenDialog.cxx +++ b/cui/source/dialogs/QrCodeGenDialog.cxx @@ -16,7 +16,11 @@ #include <utility> #include <vcl/weld.hxx> +#if defined(SYSTEM_QRCODEGEN) +#include <qrcodegen/QrCode.hpp> +#else #include <QrCode.hpp> +#endif #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> |