From e4b8ca4fc9f68b5643d18b3d3ffa877351ddd32a Mon Sep 17 00:00:00 2001 From: Christian Schenk Date: Sat, 31 Oct 2020 12:00:20 +0100 Subject: [PATCH] Fix Darwin build --- .../source/modules/QtPDF/src/backends/PopplerQtBackend.cpp | 4 ++++ Programs/Editors/TeXworks/texworks-version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Programs/Editors/TeXworks/source/modules/QtPDF/src/backends/PopplerQtBackend.cpp b/Programs/Editors/TeXworks/source/modules/QtPDF/src/backends/PopplerQtBackend.cpp index e28ace034..029671015 100644 --- a/Programs/Editors/TeXworks/source/modules/QtPDF/src/backends/PopplerQtBackend.cpp +++ b/Programs/Editors/TeXworks/source/modules/QtPDF/src/backends/PopplerQtBackend.cpp @@ -16,6 +16,7 @@ #include #include +#if !defined(MIKTEX) #if defined(HAVE_POPPLER_XPDF_HEADERS) && defined(Q_OS_DARWIN) #include "poppler-config.h" #include "GlobalParams.h" @@ -23,6 +24,7 @@ #include #include #endif +#endif // Comparison operator for QSizeF needed to use QSizeF as keys in a QMap @@ -1041,6 +1043,7 @@ QString Page::selectedText(const QList & selection, QMap // NOLINTNEXTLINE(modernize-use-equals-default) PopplerQtBackend::PopplerQtBackend() { +#if !defined(MIKTEX) #if defined(HAVE_POPPLER_XPDF_HEADERS) && defined(Q_OS_DARWIN) #if defined(POPPLER_HAS_GLOBALPARAMSINITER) QDir dataDir{QCoreApplication::applicationDirPath()}; @@ -1065,6 +1068,7 @@ PopplerQtBackend::PopplerQtBackend() { } #endif // defined(POPPLER_HAS_GLOBALPARAMSINITER) #endif // defined(HAVE_POPPLER_XPDF_HEADERS) && defined(Q_OS_DARWIN) +#endif } } // namespace QtPDF diff --git a/Programs/Editors/TeXworks/texworks-version.h b/Programs/Editors/TeXworks/texworks-version.h index 817bc7513..4bf5f7b8a 100644 --- a/Programs/Editors/TeXworks/texworks-version.h +++ b/Programs/Editors/TeXworks/texworks-version.h @@ -21,7 +21,7 @@ #define MIKTEX_COMP_MAJOR_VERSION 4 #define MIKTEX_COMP_MINOR_VERSION 0 -#define MIKTEX_COMP_PATCH_VERSION 0 +#define MIKTEX_COMP_PATCH_VERSION 1 #define MIKTEX_COMP_ORIG_VERSION_STR TEXWORKS_VERSION