From 3c5f0f8856cb1bdd6223206428bae65a04a8b144 Mon Sep 17 00:00:00 2001 From: gregory guy Date: Sun, 2 Jun 2019 11:51:06 +0200 Subject: [PATCH] The TDE integration library (libqtkde) will be searched for in the Qt plugins directory, instead of the TDE plugins directory, which cannot be known at Qt build time. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This resolves issue #3. Signed-off-by: gregory guy Signed-off-by: Slávek Banko (cherry picked from commit 1ef55acbce6782803def9c2cc7bbc6a15dd9d6c9) --- src/kernel/qtkdeintegration_x11.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/kernel/qtkdeintegration_x11.cpp b/src/kernel/qtkdeintegration_x11.cpp index a562a76..018c402 100644 --- a/src/kernel/qtkdeintegration_x11.cpp +++ b/src/kernel/qtkdeintegration_x11.cpp @@ -27,11 +27,7 @@ static QCString findLibrary() if( getenv( "QT_NO_KDE_INTEGRATION" ) == NULL || getenv( "QT_NO_KDE_INTEGRATION" )[ 0 ] == '0' ) { -#ifdef USE_LIB64_PATHES - return "/opt/kde3/lib64/kde3/plugins/integration/libqtkde"; -#else - return "/opt/kde3/lib/kde3/plugins/integration/libqtkde"; -#endif + return QCString() + qInstallPathPlugins() + "/integration/libqtkde"; } return ""; }