- kde4.(sh|csh): drop QT_PLUGINS_PATH munging, kde4-config call (#498809)
This commit is contained in:
parent
cc50bd0f86
commit
a9c663f5b7
10
kde4.csh
10
kde4.csh
@ -13,13 +13,3 @@ if ( -f /etc/sysconfig/prelink ) then
|
|||||||
unset PRELINKING
|
unset PRELINKING
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# handled in startkde, but this sets for other DE's too
|
|
||||||
set KDE4_QTPLUGINS=`kde4-config --path qtplugins`
|
|
||||||
if ( $?QT_PLUGIN_PATH ) then
|
|
||||||
if ( "$QT_PLUGIN_PATH" !~ *"${KDE4_QTPLUGINS}"* ) then
|
|
||||||
setenv QT_PLUGIN_PATH ${QT_PLUGIN_PATH}:${KDE4_QTPLUGINS}
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
setenv QT_PLUGIN_PATH ${KDE4_QTPLUGINS}
|
|
||||||
endif
|
|
||||||
unset KDE4_QTPLUGINS
|
|
||||||
|
11
kde4.sh
11
kde4.sh
@ -10,14 +10,3 @@ if [ -z "$KDE_IS_PRELINKED" ] ; then
|
|||||||
KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
|
KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# handled in startkde, but this sets for other DE's too
|
|
||||||
if [ -n "$QT_PLUGIN_PATH" ] ; then
|
|
||||||
if ! echo "$QT_PLUGIN_PATH" | grep -qw `kde4-config --path qtplugins` ; then
|
|
||||||
QT_PLUGIN_PATH="$QT_PLUGIN_PATH:`kde4-config --path qtplugins`"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
QT_PLUGIN_PATH="`kde4-config --path qtplugins`"
|
|
||||||
fi
|
|
||||||
export QT_PLUGIN_PATH
|
|
||||||
|
|
||||||
|
@ -402,6 +402,8 @@ rm -rf %{buildroot}
|
|||||||
%changelog
|
%changelog
|
||||||
* Tue May 12 2009 Than Ngo <than@redhat.com> 4.2.85-1
|
* Tue May 12 2009 Than Ngo <than@redhat.com> 4.2.85-1
|
||||||
- KDE-4.3 beta1 (4.2.85)
|
- KDE-4.3 beta1 (4.2.85)
|
||||||
|
- kde4.(sh|csh): drop QT_PLUGINS_PATH munging, kde4-config call (#498809)
|
||||||
|
|
||||||
|
|
||||||
* Wed Apr 29 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.2-14
|
* Wed Apr 29 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.2-14
|
||||||
- -devel: Provides: kdelibs4-devel%%{?_isa} ...
|
- -devel: Provides: kdelibs4-devel%%{?_isa} ...
|
||||||
|
Loading…
Reference in New Issue
Block a user