summaryrefslogtreecommitdiffstats
path: root/config.tests
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-09-17 13:11:20 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-09-17 13:11:20 +0200
commitd74fd9b0d9bf5ab80e6c104fec5a92a9b3b9372d (patch)
tree25056d484013efbbbb3eb1a78ad6a6449b671578 /config.tests
parent7de23e9fbb4c48152de5c1d26ed34cd68666aa30 (diff)
parent89afebb830f616a6e8c43dd37bf34551f243b264 (diff)
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts: src/3rdparty src/core/core_common.pri Change-Id: I36dc3a70aa653e6c8a610c787b615034180a6127
Diffstat (limited to 'config.tests')
-rw-r--r--config.tests/xml2/xml2.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/config.tests/xml2/xml2.cpp b/config.tests/xml2/xml2.cpp
index 93bc80c9..497653d9 100644
--- a/config.tests/xml2/xml2.cpp
+++ b/config.tests/xml2/xml2.cpp
@@ -27,9 +27,6 @@
****************************************************************************/
#include <libxml/xmlversion.h>
-#if defined(LIBXML_CATALOG_ENABLED)
-#error "libxml catalog enabled"
-#endif
#if !defined(LIBXML_ICU_ENABLED)
#error "libxml icu not enabled"
#endif