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>
---
 configure.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'configure.json')

diff --git a/configure.json b/configure.json
index f26187f633..85ef23a186 100644
--- a/configure.json
+++ b/configure.json
@@ -11,6 +11,7 @@
         "src/network",
         "src/sql",
         "src/gui",
+        "src/xml",
         "src/widgets",
         "src/printsupport"
     ],
@@ -933,6 +934,8 @@
         },
         "concurrent": {
             "label": "Qt Concurrent",
+            "purpose": "Provides a high-level multi-threading API.",
+            "section": "Kernel",
             "output": [ "publicFeature", "feature" ]
         },
         "dbus": {
@@ -1032,10 +1035,6 @@
             "autoDetect": false,
             "condition": "tests.wmf",
             "output": [ "publicQtConfig" ]
-        },
-        "extra_features": {
-            "comment": "### remove, once qfeatures.txt is ported to the new system",
-            "output": [ "extraFeatures" ]
         }
     },
 
-- 
cgit v1.2.3