Remove poppler 0.68 ifdefs since we require 0.86 now

remotes/origin/work/aacid/shorcutslost_2008
Albert Astals Cid 6 years ago
parent 7dce3389cb
commit eacb5eed8b
  1. 10
      generators/poppler/CMakeLists.txt
  2. 3
      generators/poppler/config-okular-poppler.h.cmake
  3. 8
      generators/poppler/pdfsignatureutils.cpp

@ -5,16 +5,6 @@ add_subdirectory( conf )
set(CMAKE_REQUIRED_LIBRARIES Poppler::Qt5 Qt5::Core Qt5::Gui)
check_cxx_source_compiles("
#include <poppler-qt5.h>
#include <poppler-form.h>
int main()
{
auto f = &Poppler::SignatureValidationInfo::reason;
(void)f;
}
" HAVE_POPPLER_0_68)
check_cxx_source_compiles("
#include <poppler-qt5.h>
#include <QColor>

@ -1,6 +1,3 @@
/* Defined if we have the 0.68 version of the Poppler library */
#cmakedefine HAVE_POPPLER_0_68 1
/* Defined if we have the 0.69 version of the Poppler library */
#cmakedefine HAVE_POPPLER_0_69 1

@ -220,20 +220,12 @@ QString PopplerSignatureInfo::signerSubjectDN() const
QString PopplerSignatureInfo::location() const
{
#ifdef HAVE_POPPLER_0_68
return m_info.location();
#else
return {};
#endif
}
QString PopplerSignatureInfo::reason() const
{
#ifdef HAVE_POPPLER_0_68
return m_info.reason();
#else
return {};
#endif
}
QDateTime PopplerSignatureInfo::signingTime() const

Loading…
Cancel
Save