diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-03-26 08:27:02 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-03-26 08:27:02 +0100 |
| commit | 8f1acd29e4d39383752899d6d05d484eb9d7935b (patch) | |
| tree | e749c4bebdd49ff702dfaa062902cbb6016cfd82 /src/corelib/configure.json | |
| parent | 945198fd237a83348feb4537d811565a2c2cd8e0 (diff) | |
| parent | 2fedce8ed8451fd9b14bc214dc26e79b0d5ab7bd (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I71cc71881fb638e207d83a8733bad8f267701c0f
Diffstat (limited to 'src/corelib/configure.json')
| -rw-r--r-- | src/corelib/configure.json | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/corelib/configure.json b/src/corelib/configure.json index 948aa0829b..ed31299603 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -374,6 +374,16 @@ ] } }, + "glibc": { + "label": "GNU libc", + "type": "compile", + "test": { + "include": "stdlib.h", + "main": [ + "return __GLIBC__;" + ] + } + }, "inotify": { "label": "inotify", "type": "compile", @@ -593,6 +603,12 @@ "condition": "libs.glib", "output": [ "privateFeature", "feature" ] }, + "glibc": { + "label": "GNU libc", + "autoDetect": "config.linux", + "condition": "tests.glibc", + "output": [ "privateFeature" ] + }, "iconv": { "label": "iconv", "purpose": "Provides internationalization on Unix.", |