Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Graphics
Okular
Commits
eacb5eed
Commit
eacb5eed
authored
Sep 13, 2020
by
Albert Astals Cid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove poppler 0.68 ifdefs since we require 0.86 now
parent
7dce3389
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
21 deletions
+0
-21
generators/poppler/CMakeLists.txt
generators/poppler/CMakeLists.txt
+0
-10
generators/poppler/config-okular-poppler.h.cmake
generators/poppler/config-okular-poppler.h.cmake
+0
-3
generators/poppler/pdfsignatureutils.cpp
generators/poppler/pdfsignatureutils.cpp
+0
-8
No files found.
generators/poppler/CMakeLists.txt
View file @
eacb5eed
...
...
@@ -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>
...
...
generators/poppler/config-okular-poppler.h.cmake
View file @
eacb5eed
/* 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
...
...
generators/poppler/pdfsignatureutils.cpp
View file @
eacb5eed
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment