From 42101f38715966120bd40d7de294708349fe0261 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 12 Feb 2021 17:16:30 +0100 Subject: [PATCH] Update two .prev_configure.cmake files that seem to be out of date Running the script updated them, without updating the configure.cmake files they relate to. Change-Id: I050d2131fa575811ae9ff4b51ef786a073c554c9 Reviewed-by: Joerg Bornemann --- src/corelib/.prev_configure.cmake | 2 +- src/network/.prev_configure.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/corelib/.prev_configure.cmake b/src/corelib/.prev_configure.cmake index 1218f552cb..46aad14689 100644 --- a/src/corelib/.prev_configure.cmake +++ b/src/corelib/.prev_configure.cmake @@ -22,7 +22,7 @@ if(QT_FEATURE_dlopen) endif() qt_find_package(Libsystemd PROVIDED_TARGETS PkgConfig::Libsystemd MODULE_NAME core QMAKE_LIB journald) qt_find_package(WrapAtomic PROVIDED_TARGETS WrapAtomic::WrapAtomic MODULE_NAME core QMAKE_LIB libatomic) -qt_find_package(Libb2 PROVIDED_TARGETS PkgConfig::Libb2 MODULE_NAME core QMAKE_LIB libb2) +qt_find_package(Libb2 PROVIDED_TARGETS Libb2::Libb2 MODULE_NAME core QMAKE_LIB libb2) qt_find_package(WrapRt PROVIDED_TARGETS WrapRt::WrapRt MODULE_NAME core QMAKE_LIB librt) qt_find_package(LTTngUST PROVIDED_TARGETS LTTng::UST MODULE_NAME core QMAKE_LIB lttng-ust) qt_add_qmake_lib_dependency(lttng-ust libdl) diff --git a/src/network/.prev_configure.cmake b/src/network/.prev_configure.cmake index 2a07ddd485..11eecba133 100644 --- a/src/network/.prev_configure.cmake +++ b/src/network/.prev_configure.cmake @@ -204,8 +204,8 @@ int main(int argc, char **argv) } ") -# netlistmgr -qt_config_compile_test(netlistmgr +# networklistmanager +qt_config_compile_test(networklistmanager LABEL "Network List Manager" CODE " @@ -387,11 +387,11 @@ qt_feature("sspi" PUBLIC CONDITION WIN32 ) qt_feature_definition("sspi" "QT_NO_SSPI" NEGATE VALUE "1") -qt_feature("netlistmgr" PRIVATE +qt_feature("networklistmanager" PRIVATE SECTION "Networking" LABEL "Network List Manager" PURPOSE "Use Network List Manager to keep track of network connectivity" - CONDITION WIN32 AND TEST_netlistmgr + CONDITION WIN32 AND TEST_networklistmanager ) qt_feature("topleveldomain" PUBLIC SECTION "Networking"