summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgregory guy <g-gregory@gmx.fr>2019-06-02 11:51:06 +0200
committerSlávek Banko <slavek.banko@axis.cz>2019-06-02 11:51:06 +0200
commit1ef55acbce6782803def9c2cc7bbc6a15dd9d6c9 (patch)
tree18243a752f96eac109aff11977dc738498133448
parent7c13f5df2fbd64512a99b66f633abb0fd7f87d35 (diff)
downloadqt3-1ef55acbce6782803def9c2cc7bbc6a15dd9d6c9.tar.gz
qt3-1ef55acbce6782803def9c2cc7bbc6a15dd9d6c9.zip
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. This resolves issue #3. Signed-off-by: gregory guy <g-gregory@gmx.fr> Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--src/kernel/qtkdeintegration_x11.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/kernel/qtkdeintegration_x11.cpp b/src/kernel/qtkdeintegration_x11.cpp
index 5fcd00f..9aabb4f 100644
--- a/src/kernel/qtkdeintegration_x11.cpp
+++ b/src/kernel/qtkdeintegration_x11.cpp
@@ -26,11 +26,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 "";
}