diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-02-15 11:35:53 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-02-16 15:06:26 +0000 |
| commit | 1aaf45e10680242511c047d84ec4f1c9a86cda7f (patch) | |
| tree | 5f5869ded6fb0f507751a0285214f27fac66433e /src/corelib/configure.json | |
| parent | 0f730ef7b6cc9571147e779183b317547011526b (diff) | |
Eliminate QT_NO_DYNAMIC_LIBRARY
The library feature already covers this. As library depends on the
dlopen compile check, we can assume dlopen to be available, also on
vxworks.
Change-Id: Idcdb07ab4688c6158651d9a5ad5e2ba126bd7d9e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/corelib/configure.json')
| -rw-r--r-- | src/corelib/configure.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/configure.json b/src/corelib/configure.json index 66bf0dac92..76dfed3128 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -211,8 +211,7 @@ }, "dlopen": { "label": "dlopen()", - "condition": "tests.dlopen || libs.libdl", - "output": [ { "type": "define", "negative": true, "name": "QT_NO_DYNAMIC_LIBRARY" } ] + "condition": "tests.dlopen || libs.libdl" }, "libdl": { "label": "dlopen() in libdl", @@ -456,6 +455,7 @@ "label": "QLibrary", "purpose": "Provides a wrapper for dynamically loaded libraries.", "section": "File I/O", + "condition": "config.win32 || config.hpux || (!config.nacl && features.dlopen)", "output": [ "publicFeature", "feature" ] }, "settings": { |