summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-02-07 16:36:05 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-02-07 16:36:05 +0900
commit3c012e46bdd579ddec66bdabead8abdd4de876eb (patch)
tree8333c199ead182650e6f3063d6fd7261cb8ef0e8
parentbcdaa92c5e9642c6513046285309aabcae37b938 (diff)
downloadadmin-3c012e46bdd579ddec66bdabead8abdd4de876eb.tar.gz
admin-3c012e46bdd579ddec66bdabead8abdd4de876eb.zip
tqt-replace and uic-tqt are no longer required
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--acinclude.m4.in2
-rw-r--r--am_edit1
2 files changed, 1 insertions, 2 deletions
diff --git a/acinclude.m4.in b/acinclude.m4.in
index d03904d..3f0c0fc 100644
--- a/acinclude.m4.in
+++ b/acinclude.m4.in
@@ -333,7 +333,7 @@ AC_DEFUN([AC_PATH_TQT_MOC_UIC],
KDE_FIND_PATH(tqmoc, MOC, [$tqt_bindirs], [KDE_MOC_ERROR_MESSAGE])
if test -z "$UIC_NOT_NEEDED"; then
if test $kde_tqtver = 3; then
- KDE_FIND_PATH(uic-tqt, UIC_PATH, [$tqt_bindirs], [UIC_PATH=""])
+ KDE_FIND_PATH(tquic, UIC_PATH, [$tqt_bindirs], [UIC_PATH=""])
fi
if test -z "$UIC_PATH" ; then
KDE_UIC_ERROR_MESSAGE
diff --git a/am_edit b/am_edit
index 277e14f..079fae9 100644
--- a/am_edit
+++ b/am_edit
@@ -820,7 +820,6 @@ sub tag_FINAL()
$handling .= "\trm -f $program.all_$suffix.files $program.all_$suffix.final; \\\n";
$handling .= "\techo \"#define KDE_USE_FINAL 1\" >> $program.all_$suffix.final; \\\n";
$handling .= "\tfor file in " . $sourcelist{$suffix} . "; do \\\n";
-# $handling .= "\t tqt-replace \$\(srcdir\)/\$\$file; \\\n";
$handling .= "\t echo \"#include \\\"\$\$file\\\"\" >> $program.all_$suffix.files; \\\n";
$handling .= "\t test ! -f \$\(srcdir\)/\$\$file || egrep '^#pragma +implementation' \$\(srcdir\)/\$\$file >> $program.all_$suffix.final; \\\n";
$handling .= "\tdone; \\\n";