From 1aaf45e10680242511c047d84ec4f1c9a86cda7f Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 15 Feb 2017 11:35:53 +0100 Subject: 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 --- src/corelib/configure.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/configure.json') 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": { -- cgit v1.2.3