Fix configuring macro for network information plugins
The actual name of these plugins differs from the name of the CMake target.
This commit is contained in:
parent
6dd98369b8
commit
7e7f8a5740
|
@ -280,6 +280,7 @@ if (STATIC_LINKAGE OR QT_TARGET_TYPE STREQUAL STATIC_LIBRARY)
|
||||||
endif ()
|
endif ()
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
# enable network information support for projects setting NETWORK_INFORMATION_SUPPORT explicitly
|
||||||
if (NETWORK_INFORMATION_SUPPORT)
|
if (NETWORK_INFORMATION_SUPPORT)
|
||||||
set(KNOWN_NETWORK_INFORMATION_PLUGINS
|
set(KNOWN_NETWORK_INFORMATION_PLUGINS
|
||||||
${META_NETWORK_INFORMATION_PLUGINS} NetworkManagerNetworkInformation GlibNetworkInformation NLMNI
|
${META_NETWORK_INFORMATION_PLUGINS} NetworkManagerNetworkInformation GlibNetworkInformation NLMNI
|
||||||
|
@ -297,13 +298,16 @@ if (STATIC_LINKAGE OR QT_TARGET_TYPE STREQUAL STATIC_LIBRARY)
|
||||||
PLUGINS
|
PLUGINS
|
||||||
${PLUGIN}
|
${PLUGIN}
|
||||||
ONLY_PLUGINS)
|
ONLY_PLUGINS)
|
||||||
|
if (PLUGIN STREQUAL NLMNI)
|
||||||
|
set(PLUGIN NetworkListManagerNetworkInformation)
|
||||||
|
endif ()
|
||||||
list(APPEND USED_NETWORK_INFORMATION_PLUGINS "${PLUGIN}")
|
list(APPEND USED_NETWORK_INFORMATION_PLUGINS "${PLUGIN}")
|
||||||
endif ()
|
endif ()
|
||||||
endforeach ()
|
endforeach ()
|
||||||
|
|
||||||
# allow importing network information plugins via qtconfig.h
|
# allow importing network information plugins via qtconfig.h
|
||||||
if (USED_NETWORK_INFORMATION_PLUGINS)
|
if (USED_NETWORK_INFORMATION_PLUGINS)
|
||||||
list_to_string(" " "\\\n Q_IMPORT_PLUGIN(Q" ")" "${USED_NETWORK_INFORMATION_PLUGINS}"
|
list_to_string(" " "\\\n Q_IMPORT_PLUGIN(Q" "BackendFactory)" "${USED_NETWORK_INFORMATION_PLUGINS}"
|
||||||
USED_NETWORK_INFORMATION_PLUGINS_ARRAY)
|
USED_NETWORK_INFORMATION_PLUGINS_ARRAY)
|
||||||
endif ()
|
endif ()
|
||||||
endif ()
|
endif ()
|
||||||
|
|
Loading…
Reference in New Issue