[poppler] 2 commits - poppler/poppler-config.h.cmake poppler/poppler-config.h.in qt4/tests

[Pino Toscano]

 poppler/poppler-config.h.cmake |   10 ----------
 poppler/poppler-config.h.in    |   10 ----------
 qt4/tests/.gitignore           |    3 +++
 3 files changed, 3 insertions(+), 20 deletions(-)

New commits:
commit 5fd2a35227c22dbddedfb397eff0e0a09c3d1b03
Author: Pino Toscano <pino at kde.org>
Date:   Wed Aug 15 19:51:43 2012 +0200

    poppler-config.h: remove WITH_FONTCONFIGURATION_* macros
    
    no public header uses them anymore, so need to expose them

diff --git a/poppler/poppler-config.h.cmake b/poppler/poppler-config.h.cmake
index 94a12aa..e125f09 100644
--- a/poppler/poppler-config.h.cmake
+++ b/poppler/poppler-config.h.cmake
@@ -44,16 +44,6 @@
 #cmakedefine TEXTOUT_WORD_LIST 1
 #endif
 
-/* Use fontconfig font configuration backend */
-#ifndef WITH_FONTCONFIGURATION_FONTCONFIG
-#cmakedefine WITH_FONTCONFIGURATION_FONTCONFIG 1
-#endif
-
-/* Use win32 font configuration backend */
-#ifndef WITH_FONTCONFIGURATION_WIN32
-#cmakedefine WITH_FONTCONFIGURATION_WIN32 1
-#endif
-
 /* Support for curl is compiled in. */
 #ifndef POPPLER_HAS_CURL_SUPPORT
 #cmakedefine POPPLER_HAS_CURL_SUPPORT 1
diff --git a/poppler/poppler-config.h.in b/poppler/poppler-config.h.in
index 302d12e..8f7cea0 100644
--- a/poppler/poppler-config.h.in
+++ b/poppler/poppler-config.h.in
@@ -44,16 +44,6 @@
 #undef TEXTOUT_WORD_LIST
 #endif
 
-/* Use fontconfig font configuration backend */
-#ifndef WITH_FONTCONFIGURATION_FONTCONFIG
-#undef WITH_FONTCONFIGURATION_FONTCONFIG
-#endif
-
-/* Use win32 font configuration backend */
-#ifndef WITH_FONTCONFIGURATION_WIN32
-#undef WITH_FONTCONFIGURATION_WIN32
-#endif
-
 /* Support for curl is compiled in. */
 #ifndef POPPLER_HAS_CURL_SUPPORT
 #undef POPPLER_HAS_CURL_SUPPORT
commit edd0ea4847c143adb1d15a57b42b0ce2b2c80b0e
Author: Pino Toscano <pino at kde.org>
Date:   Wed Aug 15 19:31:50 2012 +0200

    ignore more qt4 tests

diff --git a/qt4/tests/.gitignore b/qt4/tests/.gitignore
index de8b3b4..05b2dbf 100644
--- a/qt4/tests/.gitignore
+++ b/qt4/tests/.gitignore
@@ -12,9 +12,11 @@ test-password-qt4
 poppler-attachments
 poppler-fonts
 poppler-texts
+check_actualtext
 check_attachments
 check_dateConversion
 check_fonts
+check_links
 check_metadata
 check_optcontent
 check_permissions
@@ -22,4 +24,5 @@ check_pagelayout
 check_pagemode
 check_password
 check_search
+check_strings