am_edit: Cover all wizard include variants and class name in one regexp.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 316450ad53)
r14.1.x
Slávek Banko 4 months ago
parent 3c9e11e1dd
commit d2186b1a07
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -1366,7 +1366,7 @@ sub tag_UIFILES ()
my ($mangled_source) = $source; my ($mangled_source) = $source;
$mangled_source =~ s/[^A-Za-z0-9]/_/g; # get rid of garbage $mangled_source =~ s/[^A-Za-z0-9]/_/g; # get rid of garbage
$dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h $sourcedir$source.ui > $source.$cxxsuffix.temp ; ret=\$\$?; \\\n"; $dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h $sourcedir$source.ui > $source.$cxxsuffix.temp ; ret=\$\$?; \\\n";
$dep_lines .= "\t\$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\" ),TQString::null,g\" $source.$cxxsuffix.temp | \$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),TQString::null,g\" | \$(PERL) -pe \"s,image([0-9][0-9]*)_data,img\\\$\$1_" . $mangled_source . ",g\" | \$(PERL) -pe \"s,: TQWizard\\(,: KWizard(,g; s,: QWizard\\(,: KWizard(,g;\" >> $source.$cxxsuffix ;\\\n"; $dep_lines .= "\t\$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\" ),TQString::null,g\" $source.$cxxsuffix.temp | \$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),TQString::null,g\" | \$(PERL) -pe \"s,image([0-9][0-9]*)_data,img\\\$\$1_" . $mangled_source . ",g\" | \$(PERL) -pe \"s,: T?QWizard\\(,: KWizard(,g;\" >> $source.$cxxsuffix ;\\\n";
$dep_lines .= "\trm -f $source.$cxxsuffix.temp ;\\\n"; $dep_lines .= "\trm -f $source.$cxxsuffix.temp ;\\\n";
} else { } else {
$dep_lines .= "\t\$(UIC) -i $source.h $sourcedir$source.ui > $source.$cxxsuffix; ret=\$\$?; \\\n"; $dep_lines .= "\t\$(UIC) -i $source.h $sourcedir$source.ui > $source.$cxxsuffix; ret=\$\$?; \\\n";
@ -1375,7 +1375,7 @@ sub tag_UIFILES ()
$dep_lines .= "$source.h: $sourcedir$source.ui\n"; $dep_lines .= "$source.h: $sourcedir$source.ui\n";
$dep_lines .= "\trm -rf $source.h;\n"; $dep_lines .= "\trm -rf $source.h;\n";
if (!$kdeopts{"tqtonly"}) { if (!$kdeopts{"tqtonly"}) {
$dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pe \"s,public TQWizard,public KWizard,g; s,#include <ntqwizard.h>,#include <kwizard.h>,g; s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n"; $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pe \"s,public T?QWizard,public KWizard,g; s,#include <(n?t)?qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n";
} else { } else {
$dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n"; $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n";
} }

Loading…
Cancel
Save