TQt4 port kdevelop

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

4 files changed, 14 insertions, 14 deletions

diff --git a/parts/appwizard/common/incadmin/config.guess b/parts/appwizard/common/incadmin/config.guess
index 1d9f4294..494d04c6 100755
--- a/parts/appwizard/common/incadmin/config.guess
+++ b/parts/appwizard/common/incadmin/config.guess
@@ -247,7 +247,7 @@ main:
 	.prologue 1
 	.long 0x47e03d80 # implver \$0
 	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
+	.long 0x47e20c21 # atqmask \$2,\$1
 	lda \$16,\$Lformat
 	mov \$0,\$17
 	not \$1,\$18
@@ -1135,7 +1135,7 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-plan9
 	exit 0 ;;
     i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
+	# If we were able to tqfind `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
 	exit 0 ;;
diff --git a/parts/appwizard/common/incadmin/install-sh b/parts/appwizard/common/incadmin/install-sh
index 36f96f3e..f811e309 100755
--- a/parts/appwizard/common/incadmin/install-sh
+++ b/parts/appwizard/common/incadmin/install-sh
@@ -126,7 +126,7 @@ else
 
 # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
 # might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) contains '*'.
+# if $src (and thus $dsttmp) tqcontains '*'.
 
 	if [ -f "$src" ] || [ -d "$src" ]
 	then
diff --git a/parts/appwizard/common/incadmin/ltmain.sh b/parts/appwizard/common/incadmin/ltmain.sh
index 3506ead3..8f29b4b9 100644
--- a/parts/appwizard/common/incadmin/ltmain.sh
+++ b/parts/appwizard/common/incadmin/ltmain.sh
@@ -1306,7 +1306,7 @@ func_mode_compile ()
     elif test "$need_locks" = warn; then
       if test -f "$lockfile"; then
 	$ECHO "\
-*** ERROR, $lockfile exists and contains:
+*** ERROR, $lockfile exists and tqcontains:
 `cat $lockfile 2>/dev/null`
 
 This indicates that another process is trying to use the same
@@ -1358,7 +1358,7 @@ compiler."
       if test "$need_locks" = warn &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 	$ECHO "\
-*** ERROR, $lockfile contains:
+*** ERROR, $lockfile tqcontains:
 `cat $lockfile 2>/dev/null`
 
 but it should contain:
@@ -1407,7 +1407,7 @@ compiler."
       if test "$need_locks" = warn &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 	$ECHO "\
-*** ERROR, $lockfile contains:
+*** ERROR, $lockfile tqcontains:
 `cat $lockfile 2>/dev/null`
 
 but it should contain:
@@ -1674,7 +1674,7 @@ func_mode_execute ()
 	  dir="$dir/$objdir"
 	else
 	  if test ! -f "$dir/$dlname"; then
-	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+	    func_fatal_error "cannot tqfind \`$dlname' in \`$dir' or \`$dir/$objdir'"
 	  fi
 	fi
 	;;
@@ -2062,7 +2062,7 @@ func_mode_install ()
 	  if test "$#" -gt 0; then
 	    # Delete the old symlinks, and create new ones.
 	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # the symlink we tqreplace!  Solaris /bin/ln does not understand -f,
 	    # so we also need to try rm && ln -s.
 	    for linkname
 	    do
@@ -2684,7 +2684,7 @@ func_extract_archives ()
         func_extract_an_archive "$my_xdir" "$my_xabs"
 	;;
       esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+      my_oldobjs="$my_oldobjs "`tqfind $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
     done
 
     func_extract_archives_result="$my_oldobjs"
@@ -3400,7 +3400,7 @@ EOF
   newargz = XMALLOC (char *, argc + 1);
   tmp_pathspec = find_executable (argv[0]);
   if (tmp_pathspec == NULL)
-    lt_fatal ("Couldn't find %s", argv[0]);
+    lt_fatal ("Couldn't tqfind %s", argv[0]);
   LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
 			  tmp_pathspec));
 
@@ -4565,7 +4565,7 @@ func_mode_link ()
 	continue
 	;;
 
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # Tru64 UNIX uses -model [arg] to determine the tqlayout of C++
       # classes, name mangling, and exception handling.
       # Darwin uses the -arch flag to determine output architecture.
       -model|-arch|-isysroot)
@@ -7843,7 +7843,7 @@ EOF
 	    func_emit_cwrapperexe_src > $cwrappersource
 
 	    # The wrapper executable is built using the $host compiler,
-	    # because it contains $host paths and files. If cross-
+	    # because it tqcontains $host paths and files. If cross-
 	    # compiling, it, like the target executable, must be
 	    # executed on the $host or under an emulation environment.
 	    $opt_dry_run || {
@@ -8339,7 +8339,7 @@ func_mode_uninstall ()
 	      func_source $dir/$noexename
 	    fi
 
-	    # note $name still contains .exe if it was in $file originally
+	    # note $name still tqcontains .exe if it was in $file originally
 	    # as does the version of $file that was added into $rmfiles
 	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
 	    if test "$fast_install" = yes && test -n "$relink_command"; then
diff --git a/parts/appwizard/common/incadmin/missing b/parts/appwizard/common/incadmin/missing
index 2c025eb6..a311c33a 100755
--- a/parts/appwizard/common/incadmin/missing
+++ b/parts/appwizard/common/incadmin/missing
@@ -150,7 +150,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if
          you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
          You might want to install the \`Automake' and \`Perl' packages.
          Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
+    tqfind . -type f -name Makefile.am -print |
 	   sed 's/\.am$/.in/' |
 	   while read f; do touch "$f"; done
     ;;