From 27730e36ca260457e2afd33d51c3e3dbad9d5318 Mon Sep 17 00:00:00 2001 From: Michael Pyne Date: Sun, 26 Sep 2010 22:19:55 +0000 Subject: [PATCH] Prefer KDE libraries and binaries in LD_LIBRARY_PATH and PATH to Qt ones in case the user is using a system Qt to compile KDE. svn path=/trunk/KDE/kdesdk/scripts/kdesrc-build; revision=1180071 --- kdesrc-build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kdesrc-build b/kdesrc-build index 2de6164..47d35e5 100755 --- a/kdesrc-build +++ b/kdesrc-build @@ -5449,10 +5449,10 @@ sub update_module_environment prepend_environment_path('PKG_CONFIG_PATH', @pkg_config_dirs); # Likewise, add standard directories that should be in LD_LIBRARY_PATH. - my @ld_dirs = ("$qtdir/lib", "$kdedir/lib", get_option($module, 'libpath')); + my @ld_dirs = ("$kdedir/lib", "$qtdir/lib", get_option($module, 'libpath')); prepend_environment_path('LD_LIBRARY_PATH', @ld_dirs); - my @path = ("$qtdir/bin", "$kdedir/bin", get_option ($module, 'binpath')); + my @path = ("$kdedir/bin", "$qtdir/bin", get_option ($module, 'binpath')); if (module_uses_cmake($module)) {