diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-16 21:46:20 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-16 21:51:11 +0100 |
| commit | c577f6edafef7c40a5f78092ec4fcd78bb820b2c (patch) | |
| tree | 9ca3819e5cca9b7e61f305a874b682e5a2085e83 /src/corelib/configure.json | |
| parent | 99ce1d3d97c0423c3ee63ccf58deed964db0770e (diff) | |
| parent | de225ccdf95efb57866d62bc80872c1a2ab99703 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/corelib/plugin/qlibrary_unix.cpp
src/plugins/platforms/xcb/qxcbconnection.cpp
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
Change-Id: I632c400d909f8c204f55743aadc7886af2f15dfb
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 60248e9cd2..58b902c7ca 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", @@ -463,6 +462,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": { |