diff options
| author | Chusslove Illich <caslav.ilic@gmx.net> | 2007-06-16 14:36:43 +0000 |
|---|---|---|
| committer | Chusslove Illich <caslav.ilic@gmx.net> | 2007-06-16 14:36:43 +0000 |
| commit | b1fc7c8162575b445f0550b524afa439b29564c8 (patch) | |
| tree | eb23f3ea0e644f122c1917ce34e552d80a7f6ae4 | |
| parent | 8405ccdb9d092aa35405ad0dd98252884ea38219 (diff) | |
| download | extra-cmake-modules-b1fc7c8162575b445f0550b524afa439b29564c8.tar.gz extra-cmake-modules-b1fc7c8162575b445f0550b524afa439b29564c8.tar.bz2 | |
Redirection of translation calls generated by uic no longer necessary; KLocale::translateQt() now does the right thing.
svn path=/trunk/KDE/kdelibs/; revision=676280
| -rw-r--r-- | modules/kde4uic.cmake | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/modules/kde4uic.cmake b/modules/kde4uic.cmake index 92841663..94b177db 100644 --- a/modules/kde4uic.cmake +++ b/modules/kde4uic.cmake @@ -7,7 +7,7 @@ if (KDE3_IMPL) EXECUTE_PROCESS(COMMAND ${KDE_UIC_EXECUTABLE} - -nounload -tr tr2i18n + -nounload -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 -tr tr2i18n + -nounload ${KDE_UIC_FILE} OUTPUT_VARIABLE _uic_CONTENTS ERROR_QUIET @@ -31,7 +31,6 @@ endif (KDE3_HEADER) if (KDE4_HEADER) EXECUTE_PROCESS(COMMAND ${KDE_UIC_EXECUTABLE} - -tr tr2i18n ${KDE_UIC_FILE} OUTPUT_VARIABLE _uic_CONTENTS ERROR_QUIET @@ -41,9 +40,6 @@ 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 |