diff options
Diffstat (limited to 'package')
-rw-r--r-- | package/poppler/Config.in | 8 | ||||
-rw-r--r-- | package/poppler/poppler.mk | 9 |
2 files changed, 1 insertions, 16 deletions
diff --git a/package/poppler/Config.in b/package/poppler/Config.in index 9b03df8d27..4a553df721 100644 --- a/package/poppler/Config.in +++ b/package/poppler/Config.in @@ -13,14 +13,6 @@ config BR2_PACKAGE_POPPLER if BR2_PACKAGE_POPPLER -config BR2_PACKAGE_POPPLER_QT - bool "Qt support" - depends on BR2_PACKAGE_QT - select BR2_PACKAGE_QT_GUI_MODULE - select BR2_PACKAGE_QT_XML - help - Build Qt support into the Poppler library - config BR2_PACKAGE_POPPLER_QT5 bool "Qt5 support" depends on BR2_PACKAGE_QT5 diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index bad61a6613..be1c0e4821 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -12,7 +12,7 @@ POPPLER_LICENSE = GPL-2.0+ POPPLER_LICENSE_FILES = COPYING POPPLER_INSTALL_STAGING = YES POPPLER_CONF_OPTS = --with-font-configuration=fontconfig \ - --enable-xpdf-headers + --enable-xpdf-headers --disable-poppler-qt4 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) POPPLER_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -latomic" @@ -84,13 +84,6 @@ else POPPLER_CONF_OPTS += --without-x endif -ifeq ($(BR2_PACKAGE_POPPLER_QT),y) -POPPLER_DEPENDENCIES += qt -POPPLER_CONF_OPTS += --enable-poppler-qt4 -else -POPPLER_CONF_OPTS += --disable-poppler-qt4 -endif - ifeq ($(BR2_PACKAGE_POPPLER_QT5),y) POPPLER_DEPENDENCIES += qt5base POPPLER_CONF_OPTS += --enable-poppler-qt5 |