diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 01:36:19 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 01:36:19 +0000 |
| commit | 99a2774ca6f1cab334de5d43fe36fc44ae889a4c (patch) | |
| tree | eff34cf0762227f6baf2a93e8fef48d4bed2651c /scripts/kde-build | |
| parent | 1c104292188541106338d4940b0f04beeb4301a0 (diff) | |
| download | tdesdk-99a2774ca6f1cab334de5d43fe36fc44ae889a4c.tar.gz tdesdk-99a2774ca6f1cab334de5d43fe36fc44ae889a4c.zip | |
TQt4 convert kdesdk
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'scripts/kde-build')
| -rwxr-xr-x | scripts/kde-build | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/kde-build b/scripts/kde-build index 8790f602..1a092f95 100755 --- a/scripts/kde-build +++ b/scripts/kde-build @@ -90,15 +90,15 @@ we_started_kppp="FALSE" kppp_connect() { if [ "$USE_KPPP" = "TRUE" ]; then - kppp_process=`dcopfind -a kppp-*` + kppp_process=`dcoptqfind -a kppp-*` if [ "$kppp_process" = "" ]; then #kppp not running kppp > /dev/null 2>&1 & sleep $KPPP_LOAD_TIME - `dcop $(dcopfind -a kppp-*) KpppIface beginConnect` + `dcop $(dcoptqfind -a kppp-*) KpppIface beginConnect` #wait for a while sleep $KPPP_CONNECT_TIME - kppp_connected=`dcop $(dcopfind -a kppp-*) KpppIface isConnected` + kppp_connected=`dcop $(dcoptqfind -a kppp-*) KpppIface isConnected` if [ "$kppp_connected" = "true" ]; then we_started_kppp="TRUE" echo Connected OK @@ -107,13 +107,13 @@ if [ "$USE_KPPP" = "TRUE" ]; then fi else - kppp_connected=`dcop $(dcopfind -a kppp-*) KpppIface isConnected` + kppp_connected=`dcop $(dcoptqfind -a kppp-*) KpppIface isConnected` if [ "$kppp_connected" = "false" ]; then #Start a connection - `dcop $(dcopfind -a kppp-*) KpppIface beginConnect` + `dcop $(dcoptqfind -a kppp-*) KpppIface beginConnect` #wait for a while sleep $KPPP_CONNECT_TIME - kppp_connected=`dcop $(dcopfind -a kppp-*) KpppIface isConnected` + kppp_connected=`dcop $(dcoptqfind -a kppp-*) KpppIface isConnected` if [ "$kppp_connected" = "true" ]; then we_started_kppp="TRUE" echo Connected OK @@ -132,13 +132,13 @@ fi kppp_disconnect() { if [ "$USE_KPPP" = "TRUE" ]; then - if [ $(dcopfind -a kppp-*) = "" ]; then + if [ $(dcoptqfind -a kppp-*) = "" ]; then #kppp not running echo Kppp was not running so cannot be disconnected else if [ "$we_started_kppp" = "TRUE" ]; then echo Disconnecting kppp - `dcop $(dcopfind -a kppp-*) KpppIface disconnect` + `dcop $(dcoptqfind -a kppp-*) KpppIface disconnect` else echo We didnt connect using kppp so we wont disconnect fi @@ -409,7 +409,7 @@ else modules="$critical_modules" # This generates in 'modules' a list of the modules which shall be updated. # - potential_modules=`find $KDESRCDIR -type d -mindepth 1 \ + potential_modules=`tqfind $KDESRCDIR -type d -mindepth 1 \ -maxdepth 1 -follow | sed -e "s@.*/?*@@"` for module in $potential_modules; do if [ -d $KDESRCDIR/$module/CVS -a -w $KDESRCDIR/$module ] \ |