[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:45:15
Message-ID: 1142102715.244271.2999.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 517651 by goutte:

- klocale.h needs to be included in the header file for a KDE4 .ui3
- filter tr2i18n("") and tr2i18n("",0) 
  ( tr2i18n("","") does not seem to exist anymore.)
(Also if it is a pure Qt4 project, go back to the previous behaviour.)


 M  +7 -3      designer.um  


--- trunk/kdenonbeta/unsermake/designer.um #517650:517651
@@ -108,13 +108,17 @@
 								   rules)
 
 				# If UIC3_PATH is undefined we're using KDE 3
-				if utilities.subst_vars.has_key("UIC3_PATH"):
+				if utilities.subst_vars.has_key("UIC3_PATH") and not \
                program.mfile.get_opt("qtonly"):
                     # 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)])
+								  	["@echo '%s %s.h%s'" % (utilities.creating_text, rulef.build + base, \
utilities.normal), +									"@%s -tr ${UIC_TR} -o %s.temp $?" % (uic_version, base),
+                                    "@echo '#include <klocale.h>' > $@",
+                                    "@sed -e \
's/${UIC_TR}(\"\")/QString()/g;s/${UIC_TR}(\"\",0)/QString()/g' %s.temp >> $@" % \
(base), +									"rm -f %s.temp" % (base) ])
 				else:
                     # In KDE3, the .h has not any translatable string
+                    # And for pure Qt3/Qt4, we do not need any modification
 					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)])


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