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

List:       kde-commits
Subject:    kdenonbeta/unsermake
From:       David Faure <faure () kde ! org>
Date:       2005-12-04 21:42:40
Message-ID: 1133732560.374574.22604.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 485553 by dfaure:

Don't annoy me with uic4 stuff and re-running Makefile.cvs when a new .ui file is added in a kde3 module.


 M  +6 -2      designer.um  


--- trunk/kdenonbeta/unsermake/designer.um #485552:485553
@@ -33,8 +33,12 @@
 			elif base in rulef.definition("QT4_UIFILES"):
 				ext = '.ui4'
 			else:
-				utilities.print_error( "%s: Unknown UIC version for %s. Rerun make -f Makefile.cvs.\n"
-									   % (rulef.filename, rulef.dirname + "/" + base + ext) )
+				# If UIC3_PATH is undefined we're using KDE 3, and we can assume a qt3-format .ui file.
+				if not utilities.subst_vars.has_key("UIC3_PATH"):
+					ext = '.ui3'
+				else:
+					utilities.print_error( "%s: Unknown UIC version for %s. Rerun make -f Makefile.cvs.\n"
+										   % (rulef.filename, rulef.dirname + "/" + base + ext) )
 
 		if ext == '.ui3':
 			# If UIC3_PATH is undefined we're using KDE 3
[prev in list] [next in list] [prev in thread] [next in thread]