diff --git a/okular/generators/poppler/generator_pdf.cpp b/okular/generators/poppler/generator_pdf.cpp index 99d1b031..1b36fe37 100644 --- a/okular/generators/poppler/generator_pdf.cpp +++ b/okular/generators/poppler/generator_pdf.cpp @@ -28,7 +28,7 @@ #include #include -#if POPPLER_VERSION_MAJOR >= 22 && POPPLER_VERSION_MINOR >= 5 +#if POPPLER_VERSION_MAJOR typedef time_t popplertimetype; #else typedef poppler::time_type popplertimetype; @@ -304,7 +304,7 @@ Okular::Document::OpenResult PDFGenerator::loadDocumentWithPassword(const QStrin const poppler::page_transition *popplerpagetransition = popplerpage->transition(); if (popplerpagetransition) { Okular::PageTransition* okulartransition = new Okular::PageTransition(); -#if POPPLER_VERSION_MAJOR >= 22 && POPPLER_VERSION_MINOR >= 5 +#if POPPLER_VERSION_MAJOR >= 23 okulartransition->setDuration(qRound(popplerpagetransition->durationReal())); #else okulartransition->setDuration(popplerpagetransition->duration()); @@ -418,7 +418,7 @@ const Okular::DocumentInfo* PDFGenerator::generateDocumentInfo() m_documentinfo->set(Okular::DocumentInfo::Creator, okularString(m_popplerdocument->get_creator())); m_documentinfo->set(Okular::DocumentInfo::Producer, okularString(m_popplerdocument->get_producer())); m_documentinfo->set(Okular::DocumentInfo::Keywords, okularString(m_popplerdocument->get_keywords())); -#if POPPLER_VERSION_MAJOR >= 22 && POPPLER_VERSION_MINOR >= 5 +#if POPPLER_VERSION_MAJOR >= 23 m_documentinfo->set(Okular::DocumentInfo::CreationDate, okularTime(m_popplerdocument->get_creation_date_t())); m_documentinfo->set(Okular::DocumentInfo::ModificationDate, okularTime(m_popplerdocument->get_modification_date_t())); #else @@ -490,7 +490,7 @@ const QList* PDFGenerator::embeddedFiles() const pdfembeddedfile->m_description = okularString(popplerembeddedfile->description()); pdfembeddedfile->m_data = okularBytes(popplerembeddedfile->data()); pdfembeddedfile->m_size = popplerembeddedfile->size(); -#if POPPLER_VERSION_MAJOR >= 22 && POPPLER_VERSION_MINOR >= 5 +#if POPPLER_VERSION_MAJOR >= 23 pdfembeddedfile->m_modificationdate = okularDateTime(popplerembeddedfile->modification_date_t()); pdfembeddedfile->m_creationdate = okularDateTime(popplerembeddedfile->creation_date_t()); #else