diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,8 +23,6 @@ include(KDECompilerSettings NO_POLICY_SCOPE) include(KDEClangFormat) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake kded/config.h) - add_subdirectory(gtkproxies) add_subdirectory(gtk3proxies) add_subdirectory(kded) diff --git a/config.h.cmake b/config.h.cmake deleted file mode 100644 --- a/config.h.cmake +++ /dev/null @@ -1 +0,0 @@ -#define CMAKE_INSTALL_FULL_LIBEXECDIR "@CMAKE_INSTALL_FULL_LIBEXECDIR@" diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt --- a/kded/CMakeLists.txt +++ b/kded/CMakeLists.txt @@ -8,8 +8,9 @@ add_library(gtkconfig MODULE ${kscreen_daemon_SRCS}) target_compile_definitions(gtkconfig - PUBLIC - -DQT_NO_SIGNALS_SLOTS_KEYWORDS + PRIVATE + QT_NO_SIGNALS_SLOTS_KEYWORDS + LIBEXECDIR="${CMAKE_INSTALL_FULL_LIBEXECDIR}" ) target_include_directories(gtkconfig diff --git a/kded/themepreviewer.cpp b/kded/themepreviewer.cpp --- a/kded/themepreviewer.cpp +++ b/kded/themepreviewer.cpp @@ -34,13 +34,12 @@ #include "themepreviewer.h" #include "configeditor.h" -#include "config.h" const QString ThemePreviewer::previewGtk2ConfigPath = QStandardPaths::writableLocation(QStandardPaths::TempLocation) + QStringLiteral("/gtkrc-2.0"); const QString ThemePreviewer::currentGtk2ConfigPath = QDir::homePath() + QStringLiteral("/.gtkrc-2.0"); -const QString ThemePreviewer::gtk2PreviewerExecutablePath = QStandardPaths::findExecutable(QStringLiteral("gtk_preview"), {CMAKE_INSTALL_FULL_LIBEXECDIR}); +const QString ThemePreviewer::gtk2PreviewerExecutablePath = QStandardPaths::findExecutable(QStringLiteral("gtk_preview"), {LIBEXECDIR}); -const QString ThemePreviewer::gtk3PreviewerExecutablePath = QStandardPaths::findExecutable(QStringLiteral("gtk3_preview"), {CMAKE_INSTALL_FULL_LIBEXECDIR}); +const QString ThemePreviewer::gtk3PreviewerExecutablePath = QStandardPaths::findExecutable(QStringLiteral("gtk3_preview"), {LIBEXECDIR}); ThemePreviewer::ThemePreviewer(QObject *parent) : QObject(parent), gtk2PreviewerProccess(),