1 files changed, 31 insertions, 24 deletions
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index eb60ad213c..a8efaa509c 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -366,6 +366,15 @@
                 "main": "std::mt19937 mt(0);"
             }
         },
+        "cxx17_filesystem": {
+            "label": "C++17 <filesystem>",
+            "type": "compile",
+            "test": {
+                "include": "filesystem",
+                "main": "std::filesystem::path p(\"./file\");",
+                "qmake": "CONFIG += c++17"
+            }
+        },
         "eventfd": {
             "label": "eventfd",
             "type": "compile",
@@ -613,6 +622,13 @@
             "condition": "tests.cxx11_future",
             "output": [ "publicFeature" ]
         },
+        "cxx17_filesystem": {
+            "label": "C++17 <filesystem>",
+            "condition": "tests.cxx17_filesystem",
+            "output": [
+                "publicFeature"
+            ]
+        },
         "eventfd": {
             "label": "eventfd",
             "condition": "!config.wasm && tests.eventfd",
@@ -770,11 +786,6 @@
             "condition": "libs.pps",
             "output": [ "privateFeature" ]
         },
-        "qeventtransition": {
-            "label": "QEventTransition class",
-            "condition": "features.statemachine",
-            "output": [ "publicFeature" ]
-        },
         "renameat2": {
             "label": "renameat2()",
             "condition": "config.linux && tests.renameat2",
@@ -826,6 +837,12 @@
             ],
             "output": [ "publicFeature", "feature" ]
         },
+        "shortcut": {
+            "label": "QShortcut",
+            "purpose": "Provides keyboard accelerators and shortcuts.",
+            "section": "Kernel",
+            "output": [ "publicFeature", "feature" ]
+        },
         "systemsemaphore": {
             "label": "QSystemSemaphore",
             "purpose": "Provides a general counting system semaphore.",
@@ -873,7 +890,7 @@
             "label": "QProcess",
             "purpose": "Supports external process invocation.",
             "section": "File I/O",
-            "condition": "features.processenvironment && !config.winrt && !config.uikit && !config.integrity && !config.vxworks && !config.rtems",
+            "condition": "features.processenvironment && (features.thread || !config.unix) && !config.winrt && !config.uikit && !config.integrity && !config.vxworks && !config.rtems",
             "output": [ "publicFeature", "feature" ]
         },
         "processenvironment": {
@@ -1009,6 +1026,11 @@
             "condition": "features.properties",
             "output": [ "publicFeature", "feature" ]
         },
+        "qeventtransition": {
+            "label": "QEventTransition class",
+            "condition": "features.statemachine",
+            "output": [ "publicFeature" ]
+        },
         "gestures": {
             "label": "Gesture",
             "purpose": "Provides a framework for gestures.",
@@ -1074,15 +1096,6 @@
             "condition": "config.win32",
             "output": [ "privateFeature" ]
         },
-        "topleveldomain": {
-            "label": "QUrl::topLevelDomain()",
-            "purpose": "Provides support for extracting the top level domain from URLs.
-
-If enabled, a binary dump of the Public Suffix List (http://www.publicsuffix.org,
-Mozilla License) is included. The data is then also used in QNetworkCookieJar::validateCookie.",
-            "section": "Utilities",
-            "output": [ "publicFeature" ]
-        },
         "win32_system_libs": {
             "label": "Windows System Libraries",
             "condition": "config.win32 && libs.advapi32 && libs.gdi32 && libs.kernel32 && libs.netapi32 && libs.ole32 && libs.shell32 && libs.uuid && libs.user32 && libs.winmm && libs.ws2_32"
@@ -1113,10 +1126,7 @@ Note that this is required for plugin loading. Qt GUI needs QPA plugins for basi
         {
             "type": "note",
             "condition": "features.journald || features.syslog || (config.qnx && features.slog2)",
-            "message": "journald, syslog or slog2 integration is enabled.
-If your users intend to develop applications against this build,
-ensure that the IDEs they use either set QT_FORCE_STDERR_LOGGING to 1
-or are able to read the logged output from journald, syslog or slog2."
+            "message": "journald, syslog or slog2 integration is enabled.  If your users intend to develop applications against this build, ensure that the IDEs they use either set QT_FORCE_STDERR_LOGGING to 1 or are able to read the logged output from journald, syslog or slog2."
         },
         {
             "type": "error",
@@ -1126,15 +1136,12 @@ or are able to read the logged output from journald, syslog or slog2."
         {
             "type": "error",
             "condition": "input.doubleconversion == 'no' && !tests.xlocalescanprint",
-            "message": "Your C library does not provide sscanf_l or snprintf_l.
-You need to use libdouble-conversion for double/string conversion."
+            "message": "Your C library does not provide sscanf_l or snprintf_l.  You need to use libdouble-conversion for double/string conversion."
         },
         {
             "type": "error",
             "condition": "!tests.atomicfptr",
-            "message": "detected a std::atomic implementation that fails for function pointers.
-Please apply the patch corresponding to your Standard Library vendor, found in
-  qtbase/config.tests/atomicfptr"
+            "message": "detected a std::atomic implementation that fails for function pointers.  Please apply the patch corresponding to your Standard Library vendor, found in qtbase/config.tests/atomicfptr"
         },
         {
             "type": "error",