[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - external/poppler

[Michael Stahl]

 external/poppler/ExternalProject_poppler.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit f9c9517cae3441d2cc9aa5d09fcd8dbb042e48e7
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Dec 15 17:42:45 2014 +0100

    poppler: let's disable Qt5 too
    
    Change-Id: I8571aa0ccc9f691d7fd9290a647117161755d3a7
    (cherry picked from commit aaf717a8fad0b097b84cbd803acea1330bd925a5)
    Reviewed-on: https://gerrit.libreoffice.org/13485
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/poppler/ExternalProject_poppler.mk b/external/poppler/ExternalProject_poppler.mk
index 2663184..6a8b82c 100644
--- a/external/poppler/ExternalProject_poppler.mk
+++ b/external/poppler/ExternalProject_poppler.mk
@@ -34,6 +34,7 @@ $(call gb_ExternalProject_get_state_target,poppler,build) :
 			--disable-cairo-output \
 			--disable-poppler-glib \
 			--disable-poppler-qt4 \
+			--disable-poppler-qt5 \
 			--disable-gtk-test \
 			--disable-utils \
 			--disable-cms \