From 1d009fa37662978a70b00a9904514f7ddfd4f0e6 Mon Sep 17 00:00:00 2001 From: Richard Ramos Date: Tue, 14 Jul 2020 21:00:50 -0400 Subject: [PATCH] print connection types --- vendor/DOtherSide/lib/CMakeLists.txt | 6 +++--- vendor/DOtherSide/lib/src/DOtherSide.cpp | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/vendor/DOtherSide/lib/CMakeLists.txt b/vendor/DOtherSide/lib/CMakeLists.txt index 9db95d40ef..dcedf9961e 100644 --- a/vendor/DOtherSide/lib/CMakeLists.txt +++ b/vendor/DOtherSide/lib/CMakeLists.txt @@ -4,7 +4,7 @@ include(GNUInstallDirs) # Macro for merging common code between static and shared macro(add_target name type) - find_package(Qt5 COMPONENTS Core Qml Gui Quick QuickControls2 Widgets Network) + find_package(Qt5 COMPONENTS Core Qml Gui Quick QuickControls2 Widgets Network REQUIRED) add_library(${name} ${type} include/DOtherSide/DOtherSideTypes.h @@ -38,10 +38,10 @@ macro(add_target name type) target_include_directories(${name} PUBLIC include include/Qt) - target_link_libraries(${name} PRIVATE Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Qml Qt5::Quick) + target_link_libraries(${name} PRIVATE Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Qml Qt5::Quick Qt5::Network) # for DOtherSide.pc - set(PC_REQUIRES "Qt5Core, Qt5Gui, Qt5Widgets, Qt5Qml, Qt5Quick") + set(PC_REQUIRES "Qt5Core, Qt5Gui, Qt5Widgets, Qt5Qml, Qt5Quick, Qt5Network, Qt5DBus") if (${Qt5QuickControls2_FOUND}) target_link_libraries(${name} PRIVATE Qt5::QuickControls2) set(PC_REQUIRES "${PC_REQUIRES}, Qt5QuickControls2") diff --git a/vendor/DOtherSide/lib/src/DOtherSide.cpp b/vendor/DOtherSide/lib/src/DOtherSide.cpp index fb33b7bbcb..a4273256c4 100644 --- a/vendor/DOtherSide/lib/src/DOtherSide.cpp +++ b/vendor/DOtherSide/lib/src/DOtherSide.cpp @@ -1072,7 +1072,15 @@ void dos_qcoreapplication_process_events_timed(DosQEventLoopProcessEventFlag fla ::DosQNetworkConfigurationManager *dos_qncm_create() { - return new QNetworkConfigurationManager(); + auto *ncm = new QNetworkConfigurationManager(); + + auto netcfgList = ncm->allConfigurations(QNetworkConfiguration::Active); + for (auto& x : netcfgList) { + qDebug() << "Connection type: " << x.bearerType() << " - name: " << x.name() << " -purpose: " << x.purpose(); + } + + return ncm; + } void dos_qncm_delete(::DosQNetworkConfigurationManager *vptr)