office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-11-05 18:34:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove poppler 0.80 ifdefs since we require 0.86 now

Browse source
This commit is contained in:
Albert Astals Cid 2020-09-13 01:21:11 +02:00
parent 6b08af754f
commit 8a1bef81f8
4 changed files with 0 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
generators/poppler/CMakeLists.txt
View file

@ -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>
int main()
{
Poppler::FontInfo info;
QString substituteName = info.substituteName();
(void)substituteName;
return 0;
}
" HAVE_POPPLER_0_80)
check_cxx_source_compiles("
#include <poppler-form.h>
int main()

3
generators/poppler/config-okular-poppler.h.cmake
View file

@ -1,6 +1,3 @@
/* Defined if we have the 0.80 version of the Poppler library */
#cmakedefine HAVE_POPPLER_0_80 1
/* Defined if we have the 0.87 version of the Poppler library */
#cmakedefine HAVE_POPPLER_0_87 1

4
generators/poppler/formfields.cpp
View file

@ -235,11 +235,7 @@ void PopplerFormFieldText::setText(const QString &text)
void PopplerFormFieldText::setAppearanceText(const QString &text)
{
#ifdef HAVE_POPPLER_0_80
m_field->setAppearanceText(text);
#else
Q_UNUSED(text);
#endif
}
bool PopplerFormFieldText::isPassword() const

2
generators/poppler/generator_pdf.cpp
View file

@ -933,9 +933,7 @@ Okular::FontInfo::List PDFGenerator::fontsForPage(int page)
for (const Poppler::FontInfo &font : qAsConst(fonts)) {
Okular::FontInfo of;
of.setName(font.name());
#ifdef HAVE_POPPLER_0_80
of.setSubstituteName(font.substituteName());
#endif
of.setType(convertPopplerFontInfoTypeToOkularFontInfoType(font.type()));
of.setEmbedType(embedTypeForPopplerFontInfo(font));
of.setFile(font.file());