diff options
| author | gregory guy <[email protected]> | 2019-06-02 11:51:06 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2019-06-02 11:51:44 +0200 |
| commit | 3c5f0f8856cb1bdd6223206428bae65a04a8b144 (patch) | |
| tree | 40aa1f1153a21a14fdd6598b229d83fd8d399691 | |
| parent | 309cbda6e25ef3ced7dd90913fcf67d14d13b2d2 (diff) | |
| download | qt3-3c5f0f8856cb1bdd6223206428bae65a04a8b144.tar.gz qt3-3c5f0f8856cb1bdd6223206428bae65a04a8b144.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 <[email protected]>
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 1ef55acbce6782803def9c2cc7bbc6a15dd9d6c9)
| -rw-r--r-- | src/kernel/qtkdeintegration_x11.cpp | 6 |
1 files changed, 1 insertions, 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 ""; } |