diff --git a/ksmserver/config-ksmserver.h.cmake b/ksmserver/config-ksmserver.h.cmake index 2ad0394a1..939632c86 100644 --- a/ksmserver/config-ksmserver.h.cmake +++ b/ksmserver/config-ksmserver.h.cmake @@ -8,3 +8,5 @@ #else #define KCHECKPASS_BIN "${CMAKE_CURRENT_BINARY_DIR}/screenlocker/greeter/autotests/fakekcheckpass" #endif + +#define KSCREENLOCKER_GREET_BIN "${CMAKE_INSTALL_PREFIX}/${LIBEXEC_INSTALL_DIR}/kscreenlocker_greet" diff --git a/ksmserver/screenlocker/CMakeLists.txt b/ksmserver/screenlocker/CMakeLists.txt index 9aeec778c..b0e6cb5c7 100644 --- a/ksmserver/screenlocker/CMakeLists.txt +++ b/ksmserver/screenlocker/CMakeLists.txt @@ -2,6 +2,7 @@ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1223) add_subdirectory(kcheckpass) add_subdirectory(data) add_subdirectory(greeter) +include_directories(${CMAKE_CURRENT_BINARY_DIR}/../) set(screensaver_dbusXML dbus/org.freedesktop.ScreenSaver.xml) set(kscreensaver_dbusXML dbus/org.kde.screensaver.xml) diff --git a/ksmserver/screenlocker/ksldapp.cpp b/ksmserver/screenlocker/ksldapp.cpp index c2db0425d..62c43debf 100644 --- a/ksmserver/screenlocker/ksldapp.cpp +++ b/ksmserver/screenlocker/ksldapp.cpp @@ -25,6 +25,7 @@ along with this program. If not, see . #include "lockwindow.h" #include "logind.h" #include "kscreensaversettings.h" +#include // workspace #include // KDE @@ -34,7 +35,6 @@ along with this program. If not, see . #include // #include #include -#include #include #include #include @@ -308,7 +308,7 @@ bool KSldApp::startLockProcess(bool immediateLock) if (immediateLock) { args << "--immediateLock"; } - m_lockProcess->start(KStandardDirs::findExe(QLatin1String("kscreenlocker_greet")), args); + m_lockProcess->start(QStringLiteral(KSCREENLOCKER_GREET_BIN), args); // we wait one minute if (!m_lockProcess->waitForStarted(60000)) { m_lockProcess->kill();