Commit e283da99 authored by Albert Astals Cid's avatar Albert Astals Cid
Browse files

Remove poppler 0.69 ifdefs since we require 0.86 now

parent eacb5eed
......@@ -5,17 +5,6 @@ add_subdirectory( conf )
set(CMAKE_REQUIRED_LIBRARIES Poppler::Qt5 Qt5::Core Qt5::Gui)
check_cxx_source_compiles("
#include <poppler-qt5.h>
#include <QColor>
int main()
{
Poppler::TextAnnotation *annot = new Poppler::TextAnnotation( Poppler::TextAnnotation::InPlace );
annot->setTextColor( Qt::blue );
return 0;
}
" HAVE_POPPLER_0_69)
check_cxx_source_compiles("
#include <poppler-version.h>
int main()
......
......@@ -169,9 +169,7 @@ void PopplerAnnotationProxy::notifyModification(const Okular::Annotation *okl_an
Poppler::TextAnnotation *ppl_txtann = static_cast<Poppler::TextAnnotation *>(ppl_ann);
ppl_txtann->setTextIcon(okl_txtann->textIcon());
ppl_txtann->setTextFont(okl_txtann->textFont());
#ifdef HAVE_POPPLER_0_69
ppl_txtann->setTextColor(okl_txtann->textColor());
#endif // HAVE_POPPLER_0_69
ppl_txtann->setInplaceAlign(okl_txtann->inplaceAlignment());
ppl_txtann->setCalloutPoints(QVector<QPointF>());
ppl_txtann->setInplaceIntent((Poppler::TextAnnotation::InplaceIntent)okl_txtann->inplaceIntent());
......@@ -419,9 +417,7 @@ static Okular::Annotation *createAnnotationFromPopplerAnnotation(Poppler::TextAn
oTextAnn->setTextType(popplerToOkular(popplerAnnotation->textType()));
oTextAnn->setTextIcon(popplerAnnotation->textIcon());
oTextAnn->setTextFont(popplerAnnotation->textFont());
#ifdef HAVE_POPPLER_0_69
oTextAnn->setTextColor(popplerAnnotation->textColor());
#endif
// this works because we use the same 0:left, 1:center, 2:right meaning both in poppler and okular
oTextAnn->setInplaceAlignment(popplerAnnotation->inplaceAlign());
oTextAnn->setInplaceIntent(popplerToOkular(popplerAnnotation->inplaceIntent()));
......
/* Defined if we have the 0.69 version of the Poppler library */
#cmakedefine HAVE_POPPLER_0_69 1
/* Defined if we have the 0.73 version of the Poppler library */
#cmakedefine HAVE_POPPLER_0_73 1
......
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