summaryrefslogtreecommitdiffstats
path: root/config.tests
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2018-04-04 12:26:52 +0200
committerMichal Klocek <michal.klocek@qt.io>2018-04-12 07:14:38 +0000
commit98cfb5cee9fb7bdf9c1ede396c786be2ad0c4b33 (patch)
tree4269f2ca157f8da195dae24c5e93d27ea39eb4c5 /config.tests
parent7ad9ffe57aec62b7170e077a5bfc989e69703494 (diff)
Add check for catalog support in libxml2
Since https://codereview.chromium.org/2788063002 libxml2 is expected to have disabled catalog support. Prevent crashes of render process and do not link against system libxml2 if it is compiled with catalog support. Task-number: QTBUG-66488 Change-Id: I2d922929878262c555802336841536eba1294db2 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'config.tests')
-rw-r--r--config.tests/xml2/xml2.cpp37
-rw-r--r--config.tests/xml2/xml2.pro3
2 files changed, 40 insertions, 0 deletions
diff --git a/config.tests/xml2/xml2.cpp b/config.tests/xml2/xml2.cpp
new file mode 100644
index 00000000..17c3e3ca
--- /dev/null
+++ b/config.tests/xml2/xml2.cpp
@@ -0,0 +1,37 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <libxml/xmlversion.h>
+#if defined(LIBXML_CATALOG_ENABLED)
+#error "libxml catalog enabled"
+#endif
+
+int main(int argc, char **argv)
+{
+}
+
diff --git a/config.tests/xml2/xml2.pro b/config.tests/xml2/xml2.pro
new file mode 100644
index 00000000..6fad45f2
--- /dev/null
+++ b/config.tests/xml2/xml2.pro
@@ -0,0 +1,3 @@
+SOURCES = xml2.cpp
+CONFIG += link_pkgconfig
+PKGCONFIG += libxml-2.0