From e1ad9a6192d1e2be6fcb17c8a1e961104d921752 Mon Sep 17 00:00:00 2001
From: Alex Merry <alex.merry@kde.org>
Date: Mon, 24 Mar 2014 16:02:14 +0000
Subject: Use the full path for kconf_update when running it

It is not on $PATH, so we cannot just expect QProcess to find it.

REVIEW: 117023
---
 src/core/CMakeLists.txt | 5 +++++
 src/core/kconfig.cpp    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 4e13ee5a..0b1136bc 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -19,6 +19,11 @@ add_library(KF5ConfigCore ${libkconfigcore_SRCS})
 generate_export_header(KF5ConfigCore BASE_NAME KConfigCore)
 add_library(KF5::ConfigCore ALIAS KF5ConfigCore)
 
+target_compile_definitions(KF5ConfigCore
+    PRIVATE
+        KCONF_UPDATE_INSTALL_LOCATION="${CMAKE_INSTALL_PREFIX}/${LIBEXEC_INSTALL_DIR}/$<TARGET_FILE_NAME:KF5::kconf_update>"
+)
+
 target_include_directories(KF5ConfigCore INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/KConfigCore>")
 
 target_link_libraries(KF5ConfigCore PUBLIC Qt5::Core)
diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp
index 5a4a083d..247a4c23 100644
--- a/src/core/kconfig.cpp
+++ b/src/core/kconfig.cpp
@@ -483,7 +483,7 @@ void KConfig::checkUpdate(const QString &id, const QString &updateFile)
     const QString cfg_id = updateFile + QLatin1Char(':') + id;
     const QStringList ids = cg.readEntry("update_info", QStringList());
     if (!ids.contains(cfg_id)) {
-        QProcess::execute(QString::fromLatin1("kconf_update"), QStringList() << QString::fromLatin1("--check") << updateFile);
+        QProcess::execute(QStringLiteral(KCONF_UPDATE_INSTALL_LOCATION), QStringList() << QString::fromLatin1("--check") << updateFile);
         reparseConfiguration();
     }
 }
-- 
cgit v1.2.1