mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-01-24 18:42:12 +08:00
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
|
--- src/plasma-workspace-4.98.0/startkde/startkde.cmake 2014-07-03 14:10:59.000000000 +0000
|
||
|
|
+++ src/plasma-workspace-4.98.0/startkde/startkde.cmake 2014-07-06 15:06:02.543357638 +0000
|
||
|
|
@@ -19,14 +19,14 @@
|
||
|
|
# in case we have been started with full pathname spec without being in PATH
|
||
|
|
bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
|
||
|
|
if [ -n "$bindir" ]; then
|
||
|
|
- qbindir=`qtpaths --binaries-dir`
|
||
|
|
- qdbus=$qbindir/qdbus
|
||
|
|
+ qbindir=`qtpaths-qt5 --binaries-dir`
|
||
|
|
+ qdbus=$qbindir/qdbus-qt5
|
||
|
|
case $PATH in
|
||
|
|
$bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
|
||
|
|
*) PATH=$bindir:$PATH; export PATH;;
|
||
|
|
esac
|
||
|
|
else
|
||
|
|
- qdbus=qdbus
|
||
|
|
+ qdbus=qdbus-qt5
|
||
|
|
fi
|
||
|
|
|
||
|
|
# Check if a KDE session already is running and whether it's possible to connect to X
|
||
|
|
@@ -207,7 +207,7 @@
|
||
|
|
done
|
||
|
|
|
||
|
|
# Set the path for Qt plugins provided by KDE
|
||
|
|
-QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
|
||
|
|
+QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths-qt5 --plugin-dir`
|
||
|
|
# TODO: Do we really need this?
|
||
|
|
QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
|
||
|
|
export QT_PLUGIN_PATH
|