Commit c7fcc0e6 authored by Volker Krause's avatar Volker Krause
Browse files

Merge branch 'release/20.04'

parents 8d6a6841 8391d99b
Pipeline #23055 passed with stage
in 14 minutes and 26 seconds
......@@ -76,7 +76,7 @@ if (HAVE_POPPLER)
list(GET _poppler_version_components 2 POPPLER_VERSION_PATCH)
endif()
if (TARGET ZXing::Core)
if (TARGET ZXing::ZXing OR TARGET ZXing::Core)
set(HAVE_ZXING ON)
endif()
......
......@@ -121,7 +121,9 @@ if (HAVE_POPPLER)
target_link_libraries(KPimItinerary PRIVATE Poppler::Core)
endif()
if (HAVE_ZXING)
if (TARGET ZXing::ZXing)
target_link_libraries(KPimItinerary PRIVATE ZXing::ZXing)
elseif (TARGET ZXing::Core)
target_link_libraries(KPimItinerary PRIVATE ZXing::Core)
endif()
......
......@@ -22,13 +22,12 @@
#include <knowledgedb.h>
#include <QByteArray>
#include <QString>
#include <map>
#include <vector>
class QByteArray;
namespace KItinerary {
namespace Generator {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment