[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_4_BRANCH: kde-common/admin
From:       Stephan Kulow <coolo () kde ! org>
Date:       2005-04-18 8:49:33
Message-ID: 20050418084933.C65F3625 () office ! kde ! org
[Download RAW message or body]

CVS commit by coolo: 

backport fix for 104112


  M +6 -3      am_edit   1.412.6.4


--- kde-common/admin/am_edit  #1.412.6.3:1.412.6.4
@@ -1378,6 +1378,9 @@
                 $dep_lines .= "$source.h: $sourcedir$source.ui\n";
                 $dep_lines .= "\trm -rf $source.h;\n";
-                $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pi -e \
\"s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" \
                >> $source.h ;\n";
-
+                if (!$kdeopts{"qtonly"}) {
+                    $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pi -e \
\"s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" \
>> $source.h ;\n"; +                } else {
+                    $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n";
+                }
                 $dep_lines .= "$source.moc: $source.h\n";
                 $dep_lines .= "\t\$(MOC) $source.h -o $source.moc\n";


[prev in list] [next in list] [prev in thread] [next in thread]