diff --git a/CMakeLists.txt b/CMakeLists.txt index a5c695975fdf548233adb5aad47e4ec84d6eefa6..55964cbf1e83f6c8ae6fae3a6e37890cc6910644 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,13 +55,14 @@ target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Network KF5::NetworkManagerQt) -install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/) +set(KIRAN_DESKTOP_LIB_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/) +install(TARGETS ${PROJECT_NAME} DESTINATION ${KIRAN_DESKTOP_LIB_DIR}) file(GLOB_RECURSE HEADERS_FILE "./include/*.h") -install(FILES ${HEADERS_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}) +set(KIRAN_DESKTOP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/) +set(KIRAN_DESKTOP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/) +install(FILES ${HEADERS_FILE} DESTINATION ${KIRAN_DESKTOP_INCLUDE_DIR}) -set(KIRAN_DESKTOP_LIB_DIR ${CMAKE_INSTALL_LIBDIR}/) -set(KIRAN_DESKTOP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/kiran-desktop.pc.in kiran-desktop.pc @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kiran-desktop.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig/) diff --git a/data/kiran-desktop.pc.in b/data/kiran-desktop.pc.in index 2892194d7872dcc81015dd1edf7992dbd5c0d5ae..22dbb59cfaa9e1cdf7f468f1db9354b9f280b3f0 100644 --- a/data/kiran-desktop.pc.in +++ b/data/kiran-desktop.pc.in @@ -6,5 +6,5 @@ Name: kiran-desktop Description: kiran-desktop Shared API library Requires: Qt5Core Qt5Gui Qt5Widgets Qt5DBus Qt5Svg Qt5Network klog-qt5 Version: @KIRAN_DESKTOP_VERSION@ -Libs: -L${libdir} -lkiran-desktop -Cflags: -I${includedir}/kiran-desktop +Libs: -L${libdir} -l@PROJECT_NAME@ +Cflags: -I${includedir} diff --git a/lib/network/wireless-network-manager.cpp b/lib/network/wireless-network-manager.cpp index d21f53ae5268a4f25064e8630b6cb4906d3683b3..615d629a9c8ad0e01452f6d509279903580ef5d7 100644 --- a/lib/network/wireless-network-manager.cpp +++ b/lib/network/wireless-network-manager.cpp @@ -139,7 +139,7 @@ void WirelessNetworkManager::removeNetworkConnection(const QString &ssid) void WirelessNetworkManager::deactivateConnection() { - ActiveConnection::Ptr activeConnection = NetworkManager::findActiveConnection(d_ptr->m_device->uni()); + auto activeConnection = d_ptr->m_device->activeConnection(); if (activeConnection.isNull()) { KLOG_WARNING(qLcNetwork) << interfaceName() << "deactivate connecion failed, no active connection";