From a668c6a6b605ce516f71b9339df53699e85ad248 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Fri, 26 Aug 2016 21:19:12 +0200
Subject: Convert the old feature system

... to the new qmake based configuration system.

This removes the old qfeatures.txt (distributed over configure.json
files) and qfeatures.h (distributed over qconfig-<module>.h files).

qfeatures.prf is gone without replacement, as attempts to use it would
lead to followup errors anyway.

Change-Id: I1598de19db937082283a905b9592d3849d2199d0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 src/xml/configure.json | 16 ++++++++++++++++
 src/xml/qtxmlglobal.h  |  3 +++
 2 files changed, 19 insertions(+)
 create mode 100644 src/xml/configure.json

(limited to 'src/xml')

diff --git a/src/xml/configure.json b/src/xml/configure.json
new file mode 100644
index 0000000000..345eb8544b
--- /dev/null
+++ b/src/xml/configure.json
@@ -0,0 +1,16 @@
+{
+    "module": "xml",
+    "depends": [
+        "core"
+    ],
+    "testDir": "../../config.tests",
+
+    "features": {
+        "dom": {
+            "label": "DOM",
+            "purpose": "Supports the Document Object Model.",
+            "section": "File I/O",
+            "output": [ "publicFeature", "feature" ]
+        }
+    }
+}
diff --git a/src/xml/qtxmlglobal.h b/src/xml/qtxmlglobal.h
index de5a8ab39d..ed5de8db87 100644
--- a/src/xml/qtxmlglobal.h
+++ b/src/xml/qtxmlglobal.h
@@ -41,6 +41,9 @@
 #define QTXMLGLOBAL_H
 
 #include <QtCore/qglobal.h>
+#ifndef QT_BOOTSTRAPPED
+#  include <QtXml/qtxml-config.h>
+#endif
 
 QT_BEGIN_NAMESPACE
 
-- 
cgit v1.2.3