diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt index 2bf498401086ff8fcb2eb469dbd34c7fa1868d47..e6166ec5434f14fa55e33689af6d39dc44e6bd09 100644 --- a/src/daemon/CMakeLists.txt +++ b/src/daemon/CMakeLists.txt @@ -1,7 +1,7 @@ file(GLOB_RECURSE DAEMON_H_FILES ./*.h) file(GLOB_RECURSE DAEMON_CPP_FILES ./*.cpp) -qt_add_dbus_adaptor( +qt5_add_dbus_adaptor( AUTH_MANAGER_ADAPTOR_SRCS ${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.Authentication.xml ${CMAKE_SOURCE_DIR}/src/daemon/auth-manager.h @@ -9,7 +9,7 @@ qt_add_dbus_adaptor( auth_manager_adaptor AuthManagerAdaptor) -qt_add_dbus_adaptor( +qt5_add_dbus_adaptor( AUTH_SESSION_ADAPTOR_SRCS ${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.Authentication.Session.xml ${CMAKE_SOURCE_DIR}/src/daemon/session.h @@ -17,7 +17,7 @@ qt_add_dbus_adaptor( session_adaptor SessionAdaptor) -qt_add_dbus_adaptor( +qt5_add_dbus_adaptor( USER_ADAPTOR_SRCS ${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.Authentication.User.xml ${CMAKE_SOURCE_DIR}/src/daemon/user.h Kiran::User user_adaptor UserAdaptor) @@ -26,7 +26,7 @@ set_source_files_properties( ${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.SystemDaemon.Accounts.xml PROPERTIES CLASSNAME AccountsProxy NO_NAMESPACE true) -qt_add_dbus_interface( +qt5_add_dbus_interface( ACCOUNTS_INTERFACE_SRCS ${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.SystemDaemon.Accounts.xml accounts_proxy) @@ -35,7 +35,7 @@ set_source_files_properties( ${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.SystemDaemon.Accounts.User.xml PROPERTIES CLASSNAME AccountsUserProxy NO_NAMESPACE true) -qt_add_dbus_interface( +qt5_add_dbus_interface( ACCOUNTS_USER_INTERFACE_SRCS ${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.SystemDaemon.Accounts.User.xml accounts_user_proxy) @@ -44,7 +44,7 @@ set_source_files_properties( ${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.AuthDevice.xml PROPERTIES CLASSNAME AuthDeviceManagerProxy NO_NAMESPACE true) -qt_add_dbus_interface( +qt5_add_dbus_interface( BIOMETRICS_INTERFACE_SRCS ${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.AuthDevice.xml auth_device_manager_proxy) @@ -52,7 +52,7 @@ set_source_files_properties( ${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.AuthDevice.Device.xml PROPERTIES CLASSNAME AuthDeviceProxy NO_NAMESPACE true) -qt_add_dbus_interface( +qt5_add_dbus_interface( BIOMETRICS_DEVICE_INTERFACE_SRCS ${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.AuthDevice.Device.xml auth_device_proxy) @@ -62,7 +62,7 @@ set(TARGET_NAME kiran-authentication-daemon) configure_file(config-daemon.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-daemon.h) file(GLOB TS_FILES "${PROJECT_SOURCE_DIR}/translations/${TARGET_NAME}.*.ts") -qt_create_translation(DAEMON_QM_FILES +qt5_create_translation(DAEMON_QM_FILES ${CMAKE_CURRENT_SOURCE_DIR} ../utils ${TS_FILES} OPTIONS -I ${PROJECT_SOURCE_DIR} -I ${PROJECT_BINARY_DIR} -no-obsolete) diff --git a/src/daemon/device/device-adaptor.cpp b/src/daemon/device/device-adaptor.cpp index e521575777fdb05fa93d99c70232d3f7399f2252..d3c0435668b6d28c529b5ace9737337f5e819e02 100644 --- a/src/daemon/device/device-adaptor.cpp +++ b/src/daemon/device/device-adaptor.cpp @@ -329,7 +329,7 @@ void DeviceAdaptor::onIdentifyStatus(const QString &featureID, int result, const // 认证队列里只存当前会话里的认证请求 void DeviceAdaptor::onActiveSessionChanged(const Login1SessionItem &sessionItem) { - DEVICE_DEBUG() << "active session changed:" << sessionItem.sessionID << sessionItem.sessionObjectPath; + DEVICE_DEBUG() << "active session changed:" << sessionItem.sessionID << sessionItem.sessionObjectPath.path(); // 清空之前会话里的所有认证请求 removeAllRequest(); diff --git a/src/pam/CMakeLists.txt b/src/pam/CMakeLists.txt index 8a893217c9925345079e2c87dce5e6cba2413f92..334f33a5092cd0b5433aa1ad963f76902733b72b 100644 --- a/src/pam/CMakeLists.txt +++ b/src/pam/CMakeLists.txt @@ -5,7 +5,7 @@ set_source_files_properties( ${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.Authentication.xml PROPERTIES CLASSNAME AuthManagerProxy NO_NAMESPACE true) -qt_add_dbus_interface( +qt5_add_dbus_interface( AUTH_MANAGER_INTERFACE_SRCS ${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.Authentication.xml auth_manager_proxy) @@ -14,7 +14,7 @@ set_source_files_properties( ${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.Authentication.Session.xml PROPERTIES CLASSNAME AuthSessionProxy NO_NAMESPACE true) -qt_add_dbus_interface( +qt5_add_dbus_interface( AUTH_SESSION_INTERFACE_SRCS ${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.Authentication.Session.xml auth_session_proxy) @@ -23,7 +23,7 @@ set_source_files_properties( ${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.Authentication.User.xml PROPERTIES CLASSNAME AuthUserProxy NO_NAMESPACE true) -qt_add_dbus_interface( +qt5_add_dbus_interface( AUTH_USER_INTERFACE_SRCS ${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.Authentication.User.xml auth_user_proxy) @@ -33,7 +33,7 @@ set(TARGET_NAME pam_kiran_authentication) configure_file(config-pam.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-pam.h) file(GLOB TS_FILES "${PROJECT_SOURCE_DIR}/translations/${TARGET_NAME}.*.ts") -qt_create_translation(PAM_QM_FILES +qt5_create_translation(PAM_QM_FILES ${CMAKE_CURRENT_SOURCE_DIR} ../utils ${TS_FILES} OPTIONS -I ${PROJECT_SOURCE_DIR} -I ${PROJECT_BINARY_DIR} -no-obsolete)