From 27684b0b8b67c19afe4f724a3204c5b51e769525 Mon Sep 17 00:00:00 2001
From: Chusslove Illich <caslav.ilic@gmx.net>
Date: Sat, 16 Jun 2007 15:07:49 +0000
Subject: Revert commit 676280 (the uic -tr redirection may not be needed, but
 it is good performance wise).

svn path=/trunk/KDE/kdelibs/; revision=676291
---
 modules/kde4uic.cmake | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/kde4uic.cmake b/modules/kde4uic.cmake
index 94b177db..92841663 100644
--- a/modules/kde4uic.cmake
+++ b/modules/kde4uic.cmake
@@ -7,7 +7,7 @@
 if (KDE3_IMPL)
 
   EXECUTE_PROCESS(COMMAND ${KDE_UIC_EXECUTABLE}
-    -nounload
+    -nounload -tr tr2i18n
     -impl ${KDE_UIC_H_FILE}
     ${KDE_UIC_FILE}
     OUTPUT_VARIABLE _uic_CONTENTS
@@ -19,7 +19,7 @@ endif (KDE3_IMPL)
 if (KDE3_HEADER)
 
   EXECUTE_PROCESS(COMMAND ${KDE_UIC_EXECUTABLE}
-    -nounload
+    -nounload -tr tr2i18n
     ${KDE_UIC_FILE}
     OUTPUT_VARIABLE _uic_CONTENTS
     ERROR_QUIET
@@ -31,6 +31,7 @@ endif (KDE3_HEADER)
 if (KDE4_HEADER)
 
   EXECUTE_PROCESS(COMMAND ${KDE_UIC_EXECUTABLE}
+    -tr tr2i18n
     ${KDE_UIC_FILE}
     OUTPUT_VARIABLE _uic_CONTENTS
     ERROR_QUIET
@@ -40,6 +41,9 @@ if (KDE4_HEADER)
 endif (KDE4_HEADER)
 
 
+#replace tr218n("") with QString::null to avoid warning from KLocale
+STRING(REGEX REPLACE "tr2i18n\\(\"\"\\)" "QString::null" _uic_CONTENTS "${_uic_CONTENTS}" )
+STRING(REGEX REPLACE "tr2i18n\\(\"\", \"\"\\)" "QString::null" _uic_CONTENTS "${_uic_CONTENTS}" )
 #replace image15_data with img15_filename to make enable_final work
 STRING(REGEX REPLACE "image([0-9]+)_data" "img\\1_${KDE_UIC_BASENAME}" _uic_CONTENTS "${_uic_CONTENTS}")
 #fixup include guard
-- 
cgit v1.2.1