andrius
/
partitionmanager
1
0
Fork 0
Code Pull Requests Releases Activity

Look for kdesu binary in libexec path.

This commit is contained in:
Andrius Štikonas 2016-01-29 16:41:51 +00:00
parent 817ebf40e9
commit 53e1413d06
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -37,7 +37,7 @@ install(FILES partitionmanager.kcfg DESTINATION ${KCFG_INSTALL_DIR})
add_executable(partitionmanager ${partitionmanager_SRCS} )
target_link_libraries( partitionmanager ${BLKID_LIBRARIES}
target_link_libraries(partitionmanager ${BLKID_LIBRARIES}
kpmcore
KF5::ConfigCore
KF5::ConfigGui
@ -50,6 +50,8 @@ target_link_libraries( partitionmanager ${BLKID_LIBRARIES}
KF5::XmlGui
)
target_compile_definitions(partitionmanager PRIVATE -DCMAKE_INSTALL_FULL_LIBEXECDIR_KF5=\"${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5}\")
install(TARGETS partitionmanager ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.PartitionManager.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata)
install(FILES gui/partitionmanagerui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/partitionmanager)

3
src/util/guihelpers.cpp
View File

@ -111,7 +111,8 @@ bool loadBackend()
QString suCommand()
{
const QString candidates[] = { QStringLiteral("kdesu"), QStringLiteral("kdesudo"), QStringLiteral("gksudo"), QStringLiteral("gksu") };
QString kdesuPath = QLatin1String(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5) + QStringLiteral("/kdesu");
const QString candidates[] = { kdesuPath, QStringLiteral("kdesu"), QStringLiteral("kdesudo"), QStringLiteral("gksudo"), QStringLiteral("gksu") };
QString rval;
for (quint32 i = 0; i < sizeof(candidates) / sizeof(candidates[0]); i++) {