--- /usr/share/cmake/Modules/FindQt4.cmake.orig	2008-01-09 09:18:09.000000000 +0100
+++ /usr/share/cmake/Modules/FindQt4.cmake	2008-01-09 10:24:49.000000000 +0100
@@ -196,6 +196,8 @@
 #  QT_RCC_EXECUTABLE          Where to find the rcc tool
 #  QT_DBUSCPP2XML_EXECUTABLE  Where to find the qdbuscpp2xml tool.
 #  QT_DBUSXML2CPP_EXECUTABLE  Where to find the qdbusxml2cpp tool.
+#  QT_LUPDATE_EXECUTABLE      Where to find the lupdate tool.
+#  QT_LRELEASE_EXECUTABLE     Where to find the lrelease tool.
 #  
 #  QT_DOC_DIR                 Path to "doc" of Qt4
 #  QT_MKSPECS_DIR             Path to "mkspecs" of Qt4
@@ -818,6 +820,18 @@
     NO_DEFAULT_PATH
     )
 
+  FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
+    NAMES lupdate
+    PATHS ${QT_BINARY_DIR}
+    NO_DEFAULT_PATH
+    )
+
+  FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
+    NAMES lrelease
+    PATHS ${QT_BINARY_DIR}
+    NO_DEFAULT_PATH
+    )
+
   IF (QT_MOC_EXECUTABLE)
      SET(QT_WRAP_CPP "YES")
   ENDIF (QT_MOC_EXECUTABLE)
@@ -1082,6 +1096,43 @@
       ENDFOREACH (_current_FILE)
    ENDMACRO(QT4_AUTOMOC)
 
+   MACRO(QT4_CREATE_TRANSLATION _sources)
+      SET(_qt4_translation_files "")
+      SET(_my_sources "")
+      FOREACH (_src ${${_sources}})
+         GET_FILENAME_COMPONENT(_abs_FILE ${_src} ABSOLUTE)
+         LIST(APPEND _my_sources ${_abs_FILE})
+      ENDFOREACH(_src)
+      FOREACH (_current_FILE ${ARGN})
+         GET_FILENAME_COMPONENT(_abs_FILE ${_current_FILE} ABSOLUTE)
+         ADD_CUSTOM_COMMAND(OUTPUT ${_abs_FILE}
+            COMMAND ${QT_LUPDATE_EXECUTABLE}
+            ARGS ${_my_sources} -ts ${_abs_FILE}
+            DEPENDS ${${_sources}}
+         )
+         LIST(APPEND _qt4_translation_files ${_abs_FILE})
+      ENDFOREACH (_current_FILE)
+      ADD_CUSTOM_TARGET(qt4_update_translations ALL DEPENDS ${_qt4_translation_files})
+      QT4_ADD_TRANSLATION(${_sources} ${_qt4_translation_files})
+   ENDMACRO(QT4_CREATE_TRANSLATION _sources)
+
+   MACRO(QT4_ADD_TRANSLATION _sources)
+      FOREACH (_current_FILE ${ARGN})
+         GET_FILENAME_COMPONENT(_abs_FILE ${_current_FILE} ABSOLUTE)
+         GET_FILENAME_COMPONENT(qm ${_abs_FILE} NAME_WE)
+         SET(qm "${CMAKE_CURRENT_BINARY_DIR}/${qm}.qm")
+
+         ADD_CUSTOM_COMMAND(OUTPUT ${qm}
+            COMMAND ${QT_LRELEASE_EXECUTABLE}
+            ARGS ${_abs_FILE} -qm ${qm}
+            DEPENDS ${_abs_FILE}
+         )
+         LIST(APPEND ${_sources} ${qm})
+      ENDFOREACH (_current_FILE)
+   ENDMACRO(QT4_ADD_TRANSLATION _sources)
+
+
+
 
 
   ######################################

--- /usr/share/cmake/Modules/FindQt4.cmake	2008-01-11 03:33:28.000000000 +0100
+++ cmake/FindQt4.cmake	2008-01-14 08:01:06.000000000 +0100
@@ -57,6 +57,24 @@
 #        interface file is constructed from the basename of the header with
 #        the suffix .xml appended.
 #
+#  macro QT4_CREATE_TRANSLATION( _qt4_qm_files _qt4_ts_files _sources ts_files_to_create )
+#        out: _qt4_qm_files, _qt4_ts_files
+#        in:  _sources ts_files_to_create
+#        generates commands to create .ts (vie lupdate) and .qm
+#        (via lrelease) - files from _sources. The generated filenames can
+#        be found in _qt4_qm_files and _qt4_ts_files. You have to create
+#        an own target to update the translations:
+#        QT4_CREATE_TRANSLATION(foo_QM foo_TS foo_SRCS i18n/foo_de.ts)
+#        ADD_CUSTOM_TARGET(qt4_update_translation ALL DEPENDS ${foo_QM})
+#
+#  macro QT4_ADD_TRANSLATION( _qt4_qm_files _sources ts_files_to_update )
+#        out: _qt4_qm_files
+#        in:  _sources, ts_files_to_update
+#        generates commands to create .qm from .ts - files. The generated
+#        filenames can be found in _qt4_qm_files. The ts_files_to_update
+#        must exists and are not updated in any way.
+#
+#
 #  QT_FOUND         If false, don't try to use Qt.
 #  QT4_FOUND        If false, don't try to use Qt 4.
 #
@@ -196,6 +214,8 @@
 #  QT_RCC_EXECUTABLE          Where to find the rcc tool
 #  QT_DBUSCPP2XML_EXECUTABLE  Where to find the qdbuscpp2xml tool.
 #  QT_DBUSXML2CPP_EXECUTABLE  Where to find the qdbusxml2cpp tool.
+#  QT_LUPDATE_EXECUTABLE      Where to find the lupdate tool.
+#  QT_LRELEASE_EXECUTABLE     Where to find the lrelease tool.
 #  
 #  QT_DOC_DIR                 Path to "doc" of Qt4
 #  QT_MKSPECS_DIR             Path to "mkspecs" of Qt4
@@ -818,6 +838,18 @@
     NO_DEFAULT_PATH
     )
 
+  FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
+    NAMES lupdate
+    PATHS ${QT_BINARY_DIR}
+    NO_DEFAULT_PATH
+    )
+
+  FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
+    NAMES lrelease
+    PATHS ${QT_BINARY_DIR}
+    NO_DEFAULT_PATH
+    )
+
   IF (QT_MOC_EXECUTABLE)
      SET(QT_WRAP_CPP "YES")
   ENDIF (QT_MOC_EXECUTABLE)
@@ -1082,6 +1114,45 @@
       ENDFOREACH (_current_FILE)
    ENDMACRO(QT4_AUTOMOC)
 
+   MACRO(QT4_CREATE_TRANSLATION _qt4_qm_files _qt4_ts_files _sources)
+      SET(${_qt4_qm_files})
+      SET(${_qt4_ts_files})
+      SET(_qt4_ts_files)
+      SET(_my_sources)
+      FOREACH (_src ${${_sources}})
+         GET_FILENAME_COMPONENT(_abs_FILE ${_src} ABSOLUTE)
+         LIST(APPEND _my_sources ${_abs_FILE})
+      ENDFOREACH(_src)
+      FOREACH (_current_FILE ${ARGN})
+         GET_FILENAME_COMPONENT(_abs_FILE ${_current_FILE} ABSOLUTE)
+         ADD_CUSTOM_COMMAND(OUTPUT ${_abs_FILE}
+            COMMAND ${QT_LUPDATE_EXECUTABLE}
+            ARGS ${_my_sources} -ts ${_abs_FILE}
+            DEPENDS ${${_sources}}
+         )
+         LIST(APPEND ${_qt4_ts_files} ${_abs_FILE})
+      ENDFOREACH (_current_FILE)
+      QT4_ADD_TRANSLATION(${_qt4_qm_files} ${_sources} ${${_qt4_ts_files}})
+   ENDMACRO(QT4_CREATE_TRANSLATION _sources)
+
+   MACRO(QT4_ADD_TRANSLATION _qt4_qm_files _sources)
+      FOREACH (_current_FILE ${ARGN})
+         GET_FILENAME_COMPONENT(_abs_FILE ${_current_FILE} ABSOLUTE)
+         GET_FILENAME_COMPONENT(qm ${_abs_FILE} NAME_WE)
+         SET(qm "${CMAKE_CURRENT_BINARY_DIR}/${qm}.qm")
+
+         ADD_CUSTOM_COMMAND(OUTPUT ${qm}
+            COMMAND ${QT_LRELEASE_EXECUTABLE}
+            ARGS ${_abs_FILE} -qm ${qm}
+            DEPENDS ${_abs_FILE}
+         )
+         LIST(APPEND ${_sources} ${qm})
+         LIST(APPEND ${_qt4_qm_files} ${qm})
+      ENDFOREACH (_current_FILE)
+   ENDMACRO(QT4_ADD_TRANSLATION _sources)
+
+
+
 
 
   ######################################

Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.85
diff -u -r1.85 FindQt4.cmake
--- FindQt4.cmake	11 Jan 2008 17:40:24 -0000	1.85
+++ FindQt4.cmake	18 Jan 2008 15:52:30 -0000
@@ -69,6 +69,26 @@
 #        interface file is constructed from the basename of the header with
 #        the suffix .xml appended.
 #
+#  macro QT4_CREATE_TRANSLATION( qm_files ts_files ... sources ... )
+#        out: qm_files
+#        in:  ts_files sources
+#        generates commands to create .ts (vie lupdate) and .qm
+#        (via lrelease) - files from sources. The ts files are 
+#        created and/or updated in the source tree.  The qm files are
+#        generated in the build tree.
+#        Updating the translations can be done by adding the qm_files
+#        to the source list of your library/executable, so they are
+#        always updated, or by adding a custom target to control when
+#        they get updated/generated.
+#
+#  macro QT4_ADD_TRANSLATION( qm_files ts_files ... )
+#        out: qm_files
+#        in:  ts_files
+#        generates commands to create .qm from .ts - files. The generated
+#        filenames can be found in qm_files. The ts_files
+#        must exists and are not updated in any way.
+#
+#
 #  QT_FOUND         If false, don't try to use Qt.
 #  QT4_FOUND        If false, don't try to use Qt 4.
 #
@@ -208,6 +228,8 @@
 #  QT_RCC_EXECUTABLE          Where to find the rcc tool
 #  QT_DBUSCPP2XML_EXECUTABLE  Where to find the qdbuscpp2xml tool.
 #  QT_DBUSXML2CPP_EXECUTABLE  Where to find the qdbusxml2cpp tool.
+#  QT_LUPDATE_EXECUTABLE      Where to find the lupdate tool.
+#  QT_LRELEASE_EXECUTABLE     Where to find the lrelease tool.
 #  
 #  QT_DOC_DIR                 Path to "doc" of Qt4
 #  QT_MKSPECS_DIR             Path to "mkspecs" of Qt4
@@ -830,6 +852,18 @@
     NO_DEFAULT_PATH
     )
 
+  FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
+    NAMES lupdate
+    PATHS ${QT_BINARY_DIR}
+    NO_DEFAULT_PATH
+    )
+
+  FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
+    NAMES lrelease
+    PATHS ${QT_BINARY_DIR}
+    NO_DEFAULT_PATH
+    )
+
   IF (QT_MOC_EXECUTABLE)
      SET(QT_WRAP_CPP "YES")
   ENDIF (QT_MOC_EXECUTABLE)
@@ -1097,6 +1131,44 @@
       ENDFOREACH (_current_FILE)
    ENDMACRO(QT4_AUTOMOC)
 
+   MACRO(QT4_CREATE_TRANSLATION _qm_files)
+      SET(_my_sources)
+      SET(_my_tsfiles)
+      FOREACH (_file ${ARGN})
+         GET_FILENAME_COMPONENT(_ext ${_file} EXT)
+         GET_FILENAME_COMPONENT(_abs_FILE ${_file} ABSOLUTE)
+         IF(_ext MATCHES "ts")
+           LIST(APPEND _my_tsfiles ${_abs_FILE})
+         ELSE(_ext MATCHES "ts")
+           LIST(APPEND _my_sources ${_abs_FILE})
+         ENDIF(_ext MATCHES "ts")
+      ENDFOREACH(_file)
+      FOREACH(_ts_file ${_my_tsfiles})
+        ADD_CUSTOM_COMMAND(OUTPUT ${_ts_file}
+           COMMAND ${QT_LUPDATE_EXECUTABLE}
+           ARGS ${_my_sources} -ts ${_ts_file}
+           DEPENDS ${_my_sources})
+      ENDFOREACH(_ts_file)
+      QT4_ADD_TRANSLATION(${_qm_files} ${_my_tsfiles})
+   ENDMACRO(QT4_CREATE_TRANSLATION)
+
+   MACRO(QT4_ADD_TRANSLATION _qm_files)
+      FOREACH (_current_FILE ${ARGN})
+         GET_FILENAME_COMPONENT(_abs_FILE ${_current_FILE} ABSOLUTE)
+         GET_FILENAME_COMPONENT(qm ${_abs_FILE} NAME_WE)
+         SET(qm "${CMAKE_CURRENT_BINARY_DIR}/${qm}.qm")
+
+         ADD_CUSTOM_COMMAND(OUTPUT ${qm}
+            COMMAND ${QT_LRELEASE_EXECUTABLE}
+            ARGS ${_abs_FILE} -qm ${qm}
+            DEPENDS ${_abs_FILE}
+         )
+         SET(${_qm_files} ${${_qm_files}} ${qm})
+      ENDFOREACH (_current_FILE)
+   ENDMACRO(QT4_ADD_TRANSLATION)
+
+
+
 
 
   ######################################