summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorgregory guy <[email protected]>2019-06-02 02:23:45 +0200
committerSlávek Banko <[email protected]>2019-06-02 11:47:50 +0200
commit6e7a186f1e5bbd7e4b5e9150a422f4bc523efb7f (patch)
treedeacd97fa6c84eacb41d8a6732155c7eecf4d5d4 /src
parent5787486cb7beb73f662ab7ecc5d23febcda05cf3 (diff)
downloadtqt3-6e7a186f1e5bbd7e4b5e9150a422f4bc523efb7f.tar.gz
tqt3-6e7a186f1e5bbd7e4b5e9150a422f4bc523efb7f.zip
The TDE integration library (libtqtkde) will be searched for
in the TQt plugins directory, instead of the TDE plugins directory, which cannot be known at TQt build time. This resolves issue #3. Signed-off-by: gregory guy <[email protected]> Signed-off-by: Slávek Banko <[email protected]> (cherry picked from commit d3b13515ef865fe7304afaa7a119cf326f2c774d)
Diffstat (limited to 'src')
-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 b61920fcf..96bdde0f3 100644
--- a/src/kernel/qtkdeintegration_x11.cpp
+++ b/src/kernel/qtkdeintegration_x11.cpp
@@ -27,11 +27,7 @@ static TQCString 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 TQCString() + tqInstallPathPlugins() + "/integration/libqtkde";
}
return "";
}