diff --git a/CMakeLists.txt b/CMakeLists.txt index dc97c3cd13..0a7b5d7596 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -313,7 +313,7 @@ endif() # poppler find_package(PkgConfig) -pkg_check_modules(POPPLER QUIET IMPORTED_TARGET poppler-cpp poppler-qt${QT_VERSION_MAJOR}) +pkg_check_modules(POPPLER QUIET IMPORTED_TARGET poppler poppler-cpp poppler-qt${QT_VERSION_MAJOR}) if(POPPLER_FOUND) message(STATUS "Build internal pdf previewer.") else() diff --git a/src/pdfviewer/pdfrendermanager.cpp b/src/pdfviewer/pdfrendermanager.cpp index ad1184ab05..452033ef53 100644 --- a/src/pdfviewer/pdfrendermanager.cpp +++ b/src/pdfviewer/pdfrendermanager.cpp @@ -16,6 +16,11 @@ #include "configmanagerinterface.h" #include +#ifdef Q_OS_MAC +// enable setting datadir relative to binary on mac +#include "GlobalParams.h" +#endif + const int kMaxPageZoom = 1000000; // maximal resolution for rendering @@ -150,6 +155,13 @@ QSharedPointer PDFRenderManager::loadDocument(const QString & return QSharedPointer(); } +#ifdef Q_OS_MAC + QDir dataDir{QCoreApplication::applicationDirPath()}; + if (dataDir.cd(QStringLiteral("../share/poppler"))) { + GlobalParamsIniter::setCustomDataDir(qPrintable(dataDir.path())); + } +#endif + std::unique_ptr docPtr; HiddenByteArray ownerPassword; //for permission settings (not needed?)