Merge remote-tracking branch 'origin/dev' into wip/cmake

Take 5.

Change-Id: Ifb2d20e95ba824e45e667fba6c2ba45389991cc3

1 files changed, 67 insertions, 3 deletions

diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index cdf9586100..6274a556b3 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -235,6 +235,66 @@
             "sources": [
                 "-lslog2"
             ]
+        },
+        "advapi32": {
+            "label": "advapi32",
+            "sources": [
+                "-ladvapi32"
+            ]
+        },
+        "gdi32": {
+            "label": "gdi32",
+            "sources": [
+                "-lgdi32"
+            ]
+        },
+        "kernel32": {
+            "label": "kernel32",
+            "sources": [
+                "-lkernel32"
+            ]
+        },
+        "netapi32": {
+            "label": "netapi32",
+            "sources": [
+                "-lnetapi32"
+            ]
+        },
+        "ole32": {
+            "label": "ole32",
+            "sources": [
+                "-lole32"
+            ]
+        },
+        "shell32": {
+            "label": "shell32",
+            "sources": [
+                "-lshell32"
+            ]
+        },
+        "uuid": {
+            "label": "uuid",
+            "sources": [
+                "-luuid"
+            ]
+        },
+        "user32": {
+            "label": "user32",
+            "sources": [
+                "-luser32"
+            ]
+        },
+        "winmm": {
+            "label": "winmm",
+            "sources": [
+                "-lwinmm"
+            ]
+        },
+        "ws2_32": {
+            "label": "ws2_32",
+            "sources": [
+                "-lws2_32"
+            ]
         }
     },
 
@@ -786,7 +846,7 @@
             "purpose": "Provides a general counting system semaphore.",
             "section": "Kernel",
             "condition": [
-                "!config.integrity && !config.vxworks",
+                "!config.integrity && !config.vxworks && !config.rtems",
                 "config.android || config.win32 || tests.ipc_sysv || tests.ipc_posix"
             ],
             "output": [ "publicFeature", "feature" ]
@@ -828,14 +888,14 @@
             "label": "QProcess",
             "purpose": "Supports external process invocation.",
             "section": "File I/O",
-            "condition": "features.processenvironment && !config.winrt && !config.uikit && !config.integrity && !config.vxworks",
+            "condition": "features.processenvironment && !config.winrt && !config.uikit && !config.integrity && !config.vxworks && !config.rtems",
             "output": [ "publicFeature", "feature" ]
         },
         "processenvironment": {
             "label": "QProcessEnvironment",
             "purpose": "Provides a higher-level abstraction of environment variables.",
             "section": "File I/O",
-            "condition": "!config.winrt && !config.integrity",
+            "condition": "!config.winrt && !config.integrity && !config.rtems",
             "output": [ "publicFeature" ]
         },
         "temporaryfile": {
@@ -1014,6 +1074,10 @@
             "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"
         }
     },