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

List:       kde-commits
Subject:    kdenonbeta/unsermake
From:       Nicolas Goutte <nicolasg () snafu ! de>
Date:       2006-03-11 18:20:20
Message-ID: 1142101220.017432.1173.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 517647 by goutte:

Fix the generation of the header file of a Qt3 UI file in KDE4

The problem is that it is here that the translated strings are,so
uic3 must be called with the parameter: -tr tr2i18n

TODO: we need to catch empty strings as tr2i18n parameters


 M  +10 -1     designer.um  


--- trunk/kdenonbeta/unsermake/designer.um #517646:517647
@@ -107,9 +107,18 @@
 								   [sourcedir + base + ext, rulef.build + base + ".h"],
 								   rules)
 
-				rulef.insertTarget(rulef.build + base + ".h", [sourcedir + base + ext],
+				# If UIC3_PATH is undefined we're using KDE 3
+				if utilities.subst_vars.has_key("UIC3_PATH"):
+                    # In KDE4, it is the .h file who has translatable strings
+					rulef.insertTarget(rulef.build + base + ".h", [sourcedir + base + ext],
 								   ["@echo '%s %s.h%s'" % (utilities.creating_text, rulef.build + base, utilities.normal),
+									"@%s -tr ${UIC_TR} -o $@ $?" % (uic_version)])
+				else:
+                    # In KDE3, the .h has not any translatable string
+					rulef.insertTarget(rulef.build + base + ".h", [sourcedir + base + ext],
+								   ["@echo '%s %s.h%s'" % (utilities.creating_text, rulef.build + base, utilities.normal),
 									"@%s -o $@ $?" % (uic_version)])
+
 			
 				rulef.insertTarget(rulef.build + base + program.objext,
 								   [rulef.build + base + ".h", rulef.build + base + ".moc"])
[prev in list] [next in list] [prev in thread] [next in thread]