diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index fbfe80a..0607866 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -2,10 +2,10 @@
 # This module can be used to find Qt4.
 # The most important issue is that the Qt4 qmake is available via the system path.
 # This qmake is then used to detect basically everything else.
-# This module defines a number of key variables and macros. 
-# First is QT_USE_FILE which is the path to a CMake file that can be included 
-# to compile Qt 4 applications and libraries.  By default, the QtCore and QtGui 
-# libraries are loaded. This behavior can be changed by setting one or more 
+# This module defines a number of key variables and macros.
+# First is QT_USE_FILE which is the path to a CMake file that can be included
+# to compile Qt 4 applications and libraries.  By default, the QtCore and QtGui
+# libraries are loaded. This behavior can be changed by setting one or more
 # of the following variables to true before doing INCLUDE(${QT_USE_FILE}):
 #                    QT_DONT_USE_QTCORE
 #                    QT_DONT_USE_QTGUI
@@ -45,12 +45,12 @@
 #
 # There are also some files that need processing by some Qt tools such as moc
 # and uic.  Listed below are macros that may be used to process those files.
-#  
+#
 #  macro QT4_WRAP_CPP(outfiles inputfile ... OPTIONS ...)
 #        create moc code from a list of files containing Qt class with
-#        the Q_OBJECT declaration.  Per-direcotry preprocessor definitions 
+#        the Q_OBJECT declaration.  Per-direcotry preprocessor definitions
 #        are also added.  Options may be given to moc, such as those found
-#        when executing "moc -help".  
+#        when executing "moc -help".
 #
 #  macro QT4_WRAP_UI(outfiles inputfile ... OPTIONS ...)
 #        create code from a list of Qt designer ui files.
@@ -70,23 +70,23 @@
 #  macro QT4_AUTOMOC(sourcefile1 sourcefile2 ... )
 #        This macro is still experimental.
 #        It can be used to have moc automatically handled.
-#        So if you have the files foo.h and foo.cpp, and in foo.h a 
+#        So if you have the files foo.h and foo.cpp, and in foo.h a
 #        a class uses the Q_OBJECT macro, moc has to run on it. If you don't
 #        want to use QT4_WRAP_CPP() (which is reliable and mature), you can insert
 #        #include "foo.moc"
 #        in foo.cpp and then give foo.cpp as argument to QT4_AUTOMOC(). This will the
 #        scan all listed files at cmake-time for such included moc files and if it finds
-#        them cause a rule to be generated to run moc at build time on the 
+#        them cause a rule to be generated to run moc at build time on the
 #        accompanying header file foo.h.
 #        If a source file has the SKIP_AUTOMOC property set it will be ignored by this macro.
 #
 #  macro QT4_ADD_DBUS_INTERFACE(outfiles interface basename)
-#        create a the interface header and implementation files with the 
-#        given basename from the given interface xml file and add it to 
+#        create a the interface header and implementation files with the
+#        given basename from the given interface xml file and add it to
 #        the list of sources
 #
 #  macro QT4_ADD_DBUS_INTERFACES(outfiles inputfile ... )
-#        create the interface header and implementation files 
+#        create the interface header and implementation files
 #        for all listed interface xml files
 #        the name will be automatically determined from the name of the xml file
 #
@@ -99,18 +99,18 @@
 #
 #  macro QT4_GENERATE_DBUS_INTERFACE( header [interfacename] )
 #        generate the xml interface file from the given header.
-#        If the optional argument interfacename is omitted, the name of the 
+#        If the optional argument interfacename is omitted, the name of the
 #        interface file is constructed from the basename of the header with
 #        the suffix .xml appended.
 #
-#  macro QT4_CREATE_TRANSLATION( qm_files directories ... sources ... 
+#  macro QT4_CREATE_TRANSLATION( qm_files directories ... sources ...
 #                                ts_files ... OPTIONS ...)
 #        out: qm_files
 #        in:  directories sources ts_files
 #        options: flags to pass to lupdate, such as -extensions to specify
 #        extensions for a directory scan.
 #        generates commands to create .ts (vie lupdate) and .qm
-#        (via lrelease) - files from directories and/or sources. The ts files are 
+#        (via lrelease) - files from directories and/or sources. The ts files are
 #        created and/or updated in the source tree (unless given with full paths).
 #        The qm files are generated in the build tree.
 #        Updating the translations can be done by adding the qm_files
@@ -164,32 +164,32 @@
 #                   The QT_USE_FILE will also define QT_DEBUG and QT_NO_DEBUG
 #                   to fit your current build type.  Those are not contained
 #                   in QT_DEFINITIONS.
-#                  
-#  QT_INCLUDES      List of paths to all include directories of 
+#
+#  QT_INCLUDES      List of paths to all include directories of
 #                   Qt4 QT_INCLUDE_DIR and QT_QTCORE_INCLUDE_DIR are
 #                   always in this variable even if NOTFOUND,
 #                   all other INCLUDE_DIRS are
 #                   only added if they are found.
 #                   You do not need to use this if you include QT_USE_FILE.
-#   
+#
 #
 #  Include directories for the Qt modules are listed here.
 #  You do not need to use these variables if you include QT_USE_FILE.
 #
 #  QT_INCLUDE_DIR              Path to "include" of Qt4
-#  QT_QT3SUPPORT_INCLUDE_DIR   Path to "include/Qt3Support" 
-#  QT_QTASSISTANT_INCLUDE_DIR  Path to "include/QtAssistant" 
-#  QT_QTCORE_INCLUDE_DIR       Path to "include/QtCore"         
-#  QT_QTDESIGNER_INCLUDE_DIR   Path to "include/QtDesigner" 
+#  QT_QT3SUPPORT_INCLUDE_DIR   Path to "include/Qt3Support"
+#  QT_QTASSISTANT_INCLUDE_DIR  Path to "include/QtAssistant"
+#  QT_QTCORE_INCLUDE_DIR       Path to "include/QtCore"
+#  QT_QTDESIGNER_INCLUDE_DIR   Path to "include/QtDesigner"
 #  QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR   Path to "include/QtDesigner"
-#  QT_QTDBUS_INCLUDE_DIR       Path to "include/QtDBus" 
-#  QT_QTGUI_INCLUDE_DIR        Path to "include/QtGui" 
-#  QT_QTMOTIF_INCLUDE_DIR      Path to "include/QtMotif" 
-#  QT_QTNETWORK_INCLUDE_DIR    Path to "include/QtNetwork" 
-#  QT_QTNSPLUGIN_INCLUDE_DIR   Path to "include/QtNsPlugin" 
-#  QT_QTOPENGL_INCLUDE_DIR     Path to "include/QtOpenGL" 
-#  QT_QTSQL_INCLUDE_DIR        Path to "include/QtSql" 
-#  QT_QTXML_INCLUDE_DIR        Path to "include/QtXml" 
+#  QT_QTDBUS_INCLUDE_DIR       Path to "include/QtDBus"
+#  QT_QTGUI_INCLUDE_DIR        Path to "include/QtGui"
+#  QT_QTMOTIF_INCLUDE_DIR      Path to "include/QtMotif"
+#  QT_QTNETWORK_INCLUDE_DIR    Path to "include/QtNetwork"
+#  QT_QTNSPLUGIN_INCLUDE_DIR   Path to "include/QtNsPlugin"
+#  QT_QTOPENGL_INCLUDE_DIR     Path to "include/QtOpenGL"
+#  QT_QTSQL_INCLUDE_DIR        Path to "include/QtSql"
+#  QT_QTXML_INCLUDE_DIR        Path to "include/QtXml"
 #  QT_QTSVG_INCLUDE_DIR        Path to "include/QtSvg"
 #  QT_QTSCRIPT_INCLUDE_DIR     Path to "include/QtScript"
 #  QT_QTTEST_INCLUDE_DIR       Path to "include/QtTest"
@@ -198,11 +198,13 @@
 #  QT_QTWEBKIT_INCLUDE_DIR     Path to "include/QtWebKit"
 #  QT_QTXMLPATTERNS_INCLUDE_DIR  Path to "include/QtXmlPatterns"
 #  QT_PHONON_INCLUDE_DIR       Path to "include/phonon"
-#                            
+#
 #  QT_LIBRARY_DIR              Path to "lib" of Qt4
-# 
+#
 #  QT_PLUGINS_DIR              Path to "plugins" for Qt4
-#                            
+#
+#  QT_TRANSLATIONS_DIR         Path to "translations" for Qt4
+#
 #
 # The Qt toolkit may contain both debug and release libraries.
 # In that case, the following library variables will contain both.
@@ -232,7 +234,7 @@
 #  QT_QTWEBKIT_LIBRARY              The QtWebKit library
 #  QT_QTXMLPATTERNS_LIBRARY         The QtXmlPatterns library
 #  QT_PHONON_LIBRARY                The phonon library
-#  
+#
 # also defined, but NOT for general use are
 #  QT_MOC_EXECUTABLE          Where to find the moc tool.
 #  QT_UIC_EXECUTABLE          Where to find the uic tool.
@@ -242,20 +244,20 @@
 #  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
 #
 #
-# These are around for backwards compatibility 
+# These are around for backwards compatibility
 # they will be set
 #  QT_WRAP_CPP  Set true if QT_MOC_EXECUTABLE is found
 #  QT_WRAP_UI   Set true if QT_UIC_EXECUTABLE is found
-#  
+#
 # These variables do _NOT_ have any effect anymore (compared to FindQt.cmake)
 #  QT_MT_REQUIRED         Qt4 is now always multithreaded
-#  
-# These variables are set to "" Because Qt structure changed 
+#
+# These variables are set to "" Because Qt structure changed
 # (They make no sense in Qt4)
 #  QT_QT_LIBRARY        Qt-Library is now split
 
@@ -291,13 +293,13 @@ MACRO(QT_QUERY_QMAKE outvar invar)
   # information.  Use the same variable for both stdout and stderr
   # to make sure we get the output on all platforms.
   EXECUTE_PROCESS(COMMAND ${QT_QMAKE_EXECUTABLE}
-    WORKING_DIRECTORY  
+    WORKING_DIRECTORY
     ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake
     OUTPUT_VARIABLE _qmake_query_output
     RESULT_VARIABLE _qmake_result
     ERROR_VARIABLE _qmake_query_output )
-  
-  FILE(REMOVE_RECURSE 
+
+  FILE(REMOVE_RECURSE
     "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake")
 
   IF(_qmake_result)
@@ -327,7 +329,7 @@ IF (QT_QMAKE_EXECUTABLE)
   SET(QT_QMAKE_EXECUTABLE_LAST "${QT_QMAKE_EXECUTABLE}" CACHE INTERNAL "" FORCE)
 
   SET(QT4_QMAKE_FOUND FALSE)
-  
+
   EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION)
 
   # check for qt3 qmake and then try and find qmake4 or qmake-qt4 in the path
@@ -339,7 +341,7 @@ IF (QT_QMAKE_EXECUTABLE)
       $ENV{QTDIR}/bin
       )
     IF(QT_QMAKE_EXECUTABLE)
-      EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} 
+      EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}
         ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION)
     ENDIF(QT_QMAKE_EXECUTABLE)
   ENDIF("${QTVERSION}" MATCHES "Unknown")
@@ -404,7 +406,7 @@ IF (QT4_QMAKE_FOUND)
       MESSAGE("Warning: ${QT_LIBRARY_DIR_TMP} does NOT exist, Qt must NOT be installed correctly.")
     ENDIF(EXISTS "${QT_LIBRARY_DIR_TMP}")
   ENDIF(NOT QT_LIBRARY_DIR OR QT_QMAKE_CHANGED)
-  
+
   IF (APPLE)
     IF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
       SET(QT_USE_FRAMEWORKS ON
@@ -413,10 +415,10 @@ IF (QT4_QMAKE_FOUND)
       SET(QT_USE_FRAMEWORKS OFF
         CACHE BOOL "Set to ON if Qt build uses frameworks." FORCE)
     ENDIF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
-    
+
     MARK_AS_ADVANCED(QT_USE_FRAMEWORKS)
   ENDIF (APPLE)
-  
+
   # ask qmake for the binary dir
   IF ((QT_LIBRARY_DIR AND NOT QT_BINARY_DIR) OR QT_QMAKE_CHANGED)
      EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}
@@ -430,8 +432,8 @@ IF (QT4_QMAKE_FOUND)
   # ask qmake for the include dir
   IF ((QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR) OR QT_QMAKE_CHANGED)
       EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
-        ARGS "-query QT_INSTALL_HEADERS" 
-        OUTPUT_VARIABLE qt_headers ) 
+        ARGS "-query QT_INSTALL_HEADERS"
+        OUTPUT_VARIABLE qt_headers )
       # make sure we have / and not \ as qmake gives on windows
       FILE(TO_CMAKE_PATH "${qt_headers}" qt_headers)
       SET(QT_HEADERS_DIR ${qt_headers} CACHE INTERNAL "" FORCE)
@@ -473,14 +475,24 @@ IF (QT4_QMAKE_FOUND)
     FILE(TO_CMAKE_PATH "${qt_plugins_dir}" qt_plugins_dir)
     SET(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins" FORCE)
   ENDIF ((QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR) OR QT_QMAKE_CHANGED)
+
+  # ask qmake for the translations directory
+  IF ((QT_LIBRARY_DIR AND NOT QT_TRANSLATIONS_DIR) OR QT_QMAKE_CHANGED)
+    EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
+      ARGS "-query QT_INSTALL_TRANSLATIONS"
+      OUTPUT_VARIABLE qt_translations_dir )
+    # make sure we have / and not \ as qmake gives on windows
+    FILE(TO_CMAKE_PATH "${qt_translations_dir}" qt_translations_dir)
+    SET(QT_TRANSLATIONS_DIR ${qt_translations_dir} CACHE PATH "The location of the Qt translations" FORCE)
+  ENDIF ((QT_LIBRARY_DIR AND NOT QT_TRANSLATIONS_DIR) OR QT_QMAKE_CHANGED)
   ########################################
   #
   #       Setting the INCLUDE-Variables
   #
   ########################################
 
-  SET(QT_MODULES QtCore QtGui Qt3Support QtSvg QtScript QtTest QtUiTools 
-                 QtHelp QtWebKit QtXmlPatterns phonon QtMotif QtNetwork 
+  SET(QT_MODULES QtCore QtGui Qt3Support QtSvg QtScript QtTest QtUiTools
+                 QtHelp QtWebKit QtXmlPatterns phonon QtMotif QtNetwork
                  QtNsPlugin QtOpenGL QtSql QtXml QtDesigner QtDBus)
 
   IF(QT_QMAKE_CHANGED)
@@ -512,7 +524,7 @@ IF (QT4_QMAKE_FOUND)
               NO_DEFAULT_PATH
       )
   ENDFOREACH(QT_MODULE)
-  
+
   # Set QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR
   FIND_PATH(QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR QDesignerComponents
     PATHS
@@ -520,7 +532,7 @@ IF (QT4_QMAKE_FOUND)
     ${QT_LIBRARY_DIR}/QtDesigner.framework/Headers
     NO_DEFAULT_PATH
     )
-  
+
   # Set QT_QTASSISTANT_INCLUDE_DIR
   FIND_PATH(QT_QTASSISTANT_INCLUDE_DIR QAssistantClient
     PATHS
@@ -528,7 +540,7 @@ IF (QT4_QMAKE_FOUND)
     ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
     NO_DEFAULT_PATH
     )
-  
+
   # Set QT_QTASSISTANTCLIENT_INCLUDE_DIR
   FIND_PATH(QT_QTASSISTANTCLIENT_INCLUDE_DIR QAssistantClient
     PATHS
@@ -536,7 +548,7 @@ IF (QT4_QMAKE_FOUND)
     ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
     NO_DEFAULT_PATH
     )
-  
+
   # Set QT_INCLUDE_DIR by removine "/QtCore" in the string ${QT_QTCORE_INCLUDE_DIR}
   IF( QT_QTCORE_INCLUDE_DIR AND NOT QT_INCLUDE_DIR)
     IF (QT_USE_FRAMEWORKS)
@@ -552,9 +564,9 @@ IF (QT4_QMAKE_FOUND)
       MESSAGE( FATAL_ERROR "Could NOT find QtCore header")
     ENDIF(Qt4_FIND_REQUIRED)
   ENDIF( NOT QT_INCLUDE_DIR)
-  
+
   # Make variables changeble to the advanced user
-  MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_DOC_DIR QT_MKSPECS_DIR QT_PLUGINS_DIR)
+  MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_DOC_DIR QT_MKSPECS_DIR QT_PLUGINS_DIR QT_TRANSLATIONS_DIR)
 
   # Set QT_INCLUDES
   SET( QT_INCLUDES ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR} )
@@ -593,15 +605,15 @@ IF (QT4_QMAKE_FOUND)
   #
   #############################################
 
-  
+
   # find the libraries
   FOREACH(QT_MODULE ${QT_MODULES})
     STRING(TOUPPER ${QT_MODULE} _upper_qt_module)
-    FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_RELEASE 
+    FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_RELEASE
                  NAMES ${QT_MODULE} ${QT_MODULE}4
                  PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH
         )
-    FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_DEBUG 
+    FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_DEBUG
                  NAMES ${QT_MODULE}_debug ${QT_MODULE}d ${QT_MODULE}d4
                  PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH
         )
@@ -613,7 +625,7 @@ IF (QT4_QMAKE_FOUND)
   ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE)
 
   IF( NOT QT_QTCORE_LIBRARY_DEBUG AND NOT QT_QTCORE_LIBRARY_RELEASE )
-    
+
     # try dropping a hint if trying to use Visual Studio with Qt built by mingw
     IF(QT_LIBRARY_DIR AND MSVC)
       IF(EXISTS ${QT_LIBRARY_DIR}/libqtmain.a)
@@ -637,11 +649,11 @@ IF (QT4_QMAKE_FOUND)
     FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmaind PATHS ${QT_LIBRARY_DIR}
       NO_DEFAULT_PATH)
   ENDIF(WIN32)
-  
+
   # Set QT_QTASSISTANTCLIENT_LIBRARY
   FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NAMES QtAssistantClient QtAssistantClient4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
   FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_DEBUG   NAMES QtAssistantClient_debug QtAssistantClientd QtAssistantClientd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
-  
+
   # Set QT_QTASSISTANT_LIBRARY
   FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient QtAssistantClient4 QtAssistant QtAssistant4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
   FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG   NAMES QtAssistantClient_debug QtAssistantClientd QtAssistantClientd4 QtAssistant_debug QtAssistantd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
@@ -712,7 +724,7 @@ IF (QT4_QMAKE_FOUND)
   ENDMACRO (_QT4_ADJUST_LIB_VARS)
 
 
-  # Set QT_xyz_LIBRARY variable and add 
+  # Set QT_xyz_LIBRARY variable and add
   # library include path to QT_INCLUDES
   _QT4_ADJUST_LIB_VARS(QTCORE)
   _QT4_ADJUST_LIB_VARS(QTGUI)
@@ -742,11 +754,11 @@ IF (QT4_QMAKE_FOUND)
   IF(WIN32)
     _QT4_ADJUST_LIB_VARS(QTMAIN)
   ENDIF(WIN32)
-  
+
 
   #######################################
   #
-  #       Check the executables of Qt 
+  #       Check the executables of Qt
   #          ( moc, uic, rcc )
   #
   #######################################
@@ -757,21 +769,21 @@ IF (QT4_QMAKE_FOUND)
   QT_QUERY_QMAKE(QT_UIC_EXECUTABLE_INTERNAL "QMAKE_UIC")
 
   # make sure we have / and not \ as qmake gives on windows
-  FILE(TO_CMAKE_PATH 
+  FILE(TO_CMAKE_PATH
     "${QT_MOC_EXECUTABLE_INTERNAL}" QT_MOC_EXECUTABLE_INTERNAL)
   # make sure we have / and not \ as qmake gives on windows
-  FILE(TO_CMAKE_PATH 
+  FILE(TO_CMAKE_PATH
     "${QT_UIC_EXECUTABLE_INTERNAL}" QT_UIC_EXECUTABLE_INTERNAL)
 
   IF(QT_QMAKE_CHANGED)
-    SET(QT_MOC_EXECUTABLE 
+    SET(QT_MOC_EXECUTABLE
       ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable" FORCE)
-    SET(QT_UIC_EXECUTABLE 
+    SET(QT_UIC_EXECUTABLE
       ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable" FORCE)
   ELSE(QT_QMAKE_CHANGED)
-    SET(QT_MOC_EXECUTABLE 
+    SET(QT_MOC_EXECUTABLE
       ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable")
-    SET(QT_UIC_EXECUTABLE 
+    SET(QT_UIC_EXECUTABLE
       ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable")
   ENDIF(QT_QMAKE_CHANGED)
 
@@ -790,19 +802,19 @@ IF (QT4_QMAKE_FOUND)
     NO_DEFAULT_PATH
     )
 
-  FIND_PROGRAM(QT_RCC_EXECUTABLE 
+  FIND_PROGRAM(QT_RCC_EXECUTABLE
     NAMES rcc
     PATHS ${QT_BINARY_DIR}
     NO_DEFAULT_PATH
     )
 
-  FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE 
+  FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE
     NAMES qdbuscpp2xml
     PATHS ${QT_BINARY_DIR}
     NO_DEFAULT_PATH
     )
 
-  FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE 
+  FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE
     NAMES qdbusxml2cpp
     PATHS ${QT_BINARY_DIR}
     NO_DEFAULT_PATH
@@ -848,15 +860,15 @@ IF (QT4_QMAKE_FOUND)
       IF ("${_currentArg}" STREQUAL "OPTIONS")
         SET(_QT4_DOING_OPTIONS TRUE)
       ELSE ("${_currentArg}" STREQUAL "OPTIONS")
-        IF(_QT4_DOING_OPTIONS) 
+        IF(_QT4_DOING_OPTIONS)
           LIST(APPEND ${_qt4_options} "${_currentArg}")
         ELSE(_QT4_DOING_OPTIONS)
           LIST(APPEND ${_qt4_files} "${_currentArg}")
         ENDIF(_QT4_DOING_OPTIONS)
       ENDIF ("${_currentArg}" STREQUAL "OPTIONS")
-    ENDFOREACH(_currentArg) 
+    ENDFOREACH(_currentArg)
   ENDMACRO (QT4_EXTRACT_OPTIONS)
-  
+
   # macro used to create the names of output files preserving relative dirs
   MACRO (QT4_MAKE_OUTPUT_FILE infile prefix ext outfile )
     STRING(LENGTH ${CMAKE_CURRENT_BINARY_DIR} _binlength)
@@ -887,7 +899,7 @@ IF (QT4_QMAKE_FOUND)
      FOREACH(_current ${_inc_DIRS})
         SET(${_moc_flags} ${${_moc_flags}} "-I${_current}")
      ENDFOREACH(_current ${_inc_DIRS})
-     
+
      GET_DIRECTORY_PROPERTY(_defines COMPILE_DEFINITIONS)
      FOREACH(_current ${_defines})
         SET(${_moc_flags} ${${_moc_flags}} "-D${_current}")
@@ -924,15 +936,15 @@ IF (QT4_QMAKE_FOUND)
                          DEPENDS ${infile}
                          ${_moc_working_dir}
                          VERBATIM)
-    ELSE (WIN32)     
+    ELSE (WIN32)
       ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
                          COMMAND ${QT_MOC_EXECUTABLE}
                          ARGS ${moc_flags} ${moc_options} -o ${outfile} ${infile}
-                         DEPENDS ${infile})     
+                         DEPENDS ${infile})
     ENDIF (WIN32)
   ENDMACRO (QT4_CREATE_MOC_COMMAND)
 
-  
+
   MACRO (QT4_GENERATE_MOC infile outfile )
      QT4_GET_MOC_FLAGS(moc_flags)
      GET_FILENAME_COMPONENT(abs_infile ${infile} ABSOLUTE)
@@ -987,7 +999,7 @@ IF (QT4_QMAKE_FOUND)
       GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
       GET_FILENAME_COMPONENT(rc_path ${infile} PATH)
       SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx)
-      #  parse file for dependencies 
+      #  parse file for dependencies
       #  all files are absolute paths or relative to the location of the qrc file
       FILE(READ "${infile}" _RC_FILE_CONTENTS)
       STRING(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}")
@@ -1015,21 +1027,21 @@ IF (QT4_QMAKE_FOUND)
     SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h)
     SET(_impl   ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
     SET(_moc    ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc)
-  
+
     ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
         COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} -m -p ${_basename} ${_infile}
         DEPENDS ${_infile})
-  
+
     SET_SOURCE_FILES_PROPERTIES(${_impl} PROPERTIES SKIP_AUTOMOC TRUE)
-    
+
     QT4_GENERATE_MOC(${_header} ${_moc})
-  
+
     SET(${_sources} ${${_sources}} ${_impl} ${_header} ${_moc})
     MACRO_ADD_FILE_DEPENDENCIES(${_impl} ${_moc})
-  
+
   ENDMACRO(QT4_ADD_DBUS_INTERFACE)
-  
-  
+
+
   MACRO(QT4_ADD_DBUS_INTERFACES _sources)
      FOREACH (_current_FILE ${ARGN})
         GET_FILENAME_COMPONENT(_infile ${_current_FILE} ABSOLUTE)
@@ -1039,29 +1051,29 @@ IF (QT4_QMAKE_FOUND)
         QT4_ADD_DBUS_INTERFACE(${_sources} ${_infile} ${_basename}interface)
      ENDFOREACH (_current_FILE)
   ENDMACRO(QT4_ADD_DBUS_INTERFACES)
-  
-  
+
+
   MACRO(QT4_GENERATE_DBUS_INTERFACE _header) # _customName )
     SET(_customName "${ARGV1}")
     GET_FILENAME_COMPONENT(_in_file ${_header} ABSOLUTE)
     GET_FILENAME_COMPONENT(_basename ${_header} NAME_WE)
-    
+
     IF (_customName)
       SET(_target ${CMAKE_CURRENT_BINARY_DIR}/${_customName})
     ELSE (_customName)
       SET(_target ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.xml)
     ENDIF (_customName)
-  
+
     ADD_CUSTOM_COMMAND(OUTPUT ${_target}
         COMMAND ${QT_DBUSCPP2XML_EXECUTABLE} ${_in_file} > ${_target}
         DEPENDS ${_in_file}
     )
   ENDMACRO(QT4_GENERATE_DBUS_INTERFACE)
-  
-  
+
+
   MACRO(QT4_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optionalBasename )
     GET_FILENAME_COMPONENT(_infile ${_xml_file} ABSOLUTE)
-    
+
     SET(_optionalBasename "${ARGV4}")
     IF (_optionalBasename)
        SET(_basename ${_optionalBasename} )
@@ -1193,7 +1205,7 @@ IF (QT4_QMAKE_FOUND)
   ######################################
 
   # if the includes,libraries,moc,uic and rcc are found then we have it
-  IF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND 
+  IF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND
       QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE AND QT_QTCORE_LIBRARY)
     SET( QT4_FOUND "YES" )
     INCLUDE(FindPackageMessage)
@@ -1206,9 +1218,9 @@ IF (QT4_QMAKE_FOUND)
     IF( Qt4_FIND_REQUIRED)
       MESSAGE( FATAL_ERROR "Qt libraries, includes, moc, uic or/and rcc NOT found!")
     ENDIF( Qt4_FIND_REQUIRED)
-  ENDIF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND 
+  ENDIF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND
          QT_UIC_EXECUTABLE AND  QT_RCC_EXECUTABLE AND QT_QTCORE_LIBRARY)
-  
+
   SET(QT_FOUND ${QT4_FOUND})
 
 
@@ -1227,13 +1239,13 @@ IF (QT4_QMAKE_FOUND)
     SET(QT_EDITION_DESKTOPLIGHT 1)
   ENDIF("${QT_EDITION}" MATCHES "DesktopLight")
 
-  
+
   ###############################################
   #
-  #       configuration/system dependent settings  
+  #       configuration/system dependent settings
   #
   ###############################################
-  
+
   # find dependencies for some Qt modules
   # when doing builds against a static Qt, they are required
   # when doing builds against a shared Qt, they are sometimes not required
@@ -1247,18 +1259,18 @@ IF (QT4_QMAKE_FOUND)
   SET(QT_QTOPENGL_LIB_DEPENDENCIES "")
   SET(QT_QTDBUS_LIB_DEPENDENCIES "")
   SET(QT_QTHELP_LIB_DEPENDENCIES ${QT_QTCLUCENE_LIBRARY})
-  
+
   # build using shared Qt needs -DQT_DLL
   IF(NOT QT_CONFIG MATCHES "static")
     # warning currently only qconfig.pri on Windows potentially contains "static"
     # so QT_DLL might not get defined properly on other platforms.
     SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_DLL)
   ENDIF(NOT QT_CONFIG MATCHES "static")
-  
+
   # QtOpenGL dependencies
   QT_QUERY_QMAKE(QMAKE_LIBS_OPENGL "QMAKE_LIBS_OPENGL")
   SET (QT_QTOPENGL_LIB_DEPENDENCIES ${QT_QTOPENGL_LIB_DEPENDENCIES} ${QMAKE_LIBS_OPENGL})
-  
+
   ## system png
   IF(QT_QCONFIG MATCHES "system-png")
     FIND_LIBRARY(QT_PNG_LIBRARY NAMES png)
@@ -1267,7 +1279,7 @@ IF (QT4_QMAKE_FOUND)
       SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_PNG_LIBRARY})
     ENDIF(QT_PNG_LIBRARY)
   ENDIF(QT_QCONFIG MATCHES "system-png")
-  
+
   # for X11, get X11 library directory
   IF(Q_WS_X11)
     QT_QUERY_QMAKE(QMAKE_LIBDIR_X11 "QMAKE_LIBDIR_X11")
@@ -1284,7 +1296,7 @@ IF (QT4_QMAKE_FOUND)
       SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_X11_SM_LIBRARY} ${QT_X11_ICE_LIBRARY})
     ENDIF(QT_X11_SM_LIBRARY AND QT_X11_ICE_LIBRARY)
   ENDIF(QT_QCONFIG MATCHES "x11sm")
-  
+
   ## Xi
   IF(QT_QCONFIG MATCHES "tablet")
     FIND_LIBRARY(QT_XI_LIBRARY NAMES Xi PATHS ${QMAKE_LIBDIR_X11})
@@ -1302,7 +1314,7 @@ IF (QT4_QMAKE_FOUND)
       SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XRENDER_LIBRARY})
     ENDIF(QT_XRENDER_LIBRARY)
   ENDIF(QT_QCONFIG MATCHES "xrender")
-  
+
   ## Xrandr
   IF(QT_QCONFIG MATCHES "xrandr")
     FIND_LIBRARY(QT_XRANDR_LIBRARY NAMES Xrandr PATHS ${QMAKE_LIBDIR_X11})
@@ -1311,7 +1323,7 @@ IF (QT4_QMAKE_FOUND)
       SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XRANDR_LIBRARY})
     ENDIF(QT_XRANDR_LIBRARY)
   ENDIF(QT_QCONFIG MATCHES "xrandr")
-  
+
   ## Xcursor
   IF(QT_QCONFIG MATCHES "xcursor")
     FIND_LIBRARY(QT_XCURSOR_LIBRARY NAMES Xcursor PATHS ${QMAKE_LIBDIR_X11})
@@ -1320,7 +1332,7 @@ IF (QT4_QMAKE_FOUND)
       SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XCURSOR_LIBRARY})
     ENDIF(QT_XCURSOR_LIBRARY)
   ENDIF(QT_QCONFIG MATCHES "xcursor")
-  
+
   ## Xinerama
   IF(QT_QCONFIG MATCHES "xinerama")
     FIND_LIBRARY(QT_XINERAMA_LIBRARY NAMES Xinerama PATHS ${QMAKE_LIBDIR_X11})
@@ -1329,7 +1341,7 @@ IF (QT4_QMAKE_FOUND)
       SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XINERAMA_LIBRARY})
     ENDIF(QT_XINERAMA_LIBRARY)
   ENDIF(QT_QCONFIG MATCHES "xinerama")
-  
+
   ## Xfixes
   IF(QT_QCONFIG MATCHES "xfixes")
     FIND_LIBRARY(QT_XFIXES_LIBRARY NAMES Xfixes PATHS ${QMAKE_LIBDIR_X11})
@@ -1338,7 +1350,7 @@ IF (QT4_QMAKE_FOUND)
       SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XFIXES_LIBRARY})
     ENDIF(QT_XFIXES_LIBRARY)
   ENDIF(QT_QCONFIG MATCHES "xfixes")
-  
+
   ## system-freetype
   IF(QT_QCONFIG MATCHES "system-freetype")
     FIND_LIBRARY(QT_FREETYPE_LIBRARY NAMES freetype)
@@ -1347,7 +1359,7 @@ IF (QT4_QMAKE_FOUND)
       SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_FREETYPE_LIBRARY})
     ENDIF(QT_FREETYPE_LIBRARY)
   ENDIF(QT_QCONFIG MATCHES "system-freetype")
-  
+
   ## fontconfig
   IF(QT_QCONFIG MATCHES "fontconfig")
     FIND_LIBRARY(QT_FONTCONFIG_LIBRARY NAMES fontconfig)
@@ -1356,7 +1368,7 @@ IF (QT4_QMAKE_FOUND)
       SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_FONTCONFIG_LIBRARY})
     ENDIF(QT_FONTCONFIG_LIBRARY)
   ENDIF(QT_QCONFIG MATCHES "fontconfig")
-  
+
   ## system-zlib
   IF(QT_QCONFIG MATCHES "system-zlib")
     FIND_LIBRARY(QT_ZLIB_LIBRARY NAMES z)
@@ -1373,7 +1385,7 @@ IF (QT4_QMAKE_FOUND)
       SET(QT_QTNETWORK_LIB_DEPENDENCIES ${QT_QTNETWORK_LIB_DEPENDENCIES} ${OPENSSL_LIBRARIES})
     ENDIF(OPENSSL_LIBRARIES)
   ENDIF(QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN)
-  
+
   ## dbus
   IF(QT_QCONFIG MATCHES "dbus")
 
@@ -1384,7 +1396,7 @@ IF (QT4_QMAKE_FOUND)
         OUTPUT_VARIABLE _dbus_query_output
         RESULT_VARIABLE _dbus_result
         ERROR_VARIABLE _dbus_query_output )
-      
+
       IF(_dbus_result MATCHES 0)
         STRING(REPLACE "-L" "" _dbus_query_output "${_dbus_query_output}")
         SEPARATE_ARGUMENTS(_dbus_query_output)
@@ -1402,10 +1414,10 @@ IF (QT4_QMAKE_FOUND)
     ENDIF(NOT QT_DBUS_LIBRARY)
 
   ENDIF(QT_QCONFIG MATCHES "dbus")
-  
+
   ## glib
   IF(QT_QCONFIG MATCHES "glib")
-    
+
     # if the glib libraries aren't found, we'll assume its not required to build
     # shared Qt on Linux doesn't require it
 
@@ -1425,7 +1437,7 @@ IF (QT4_QMAKE_FOUND)
 
       FIND_LIBRARY(QT_GLIB_LIBRARY NAMES glib-2.0 PATHS ${_glib_query_output} )
       FIND_LIBRARY(QT_GTHREAD_LIBRARY NAMES gthread-2.0 PATHS ${_glib_query_output} )
-    
+
       MARK_AS_ADVANCED(QT_GLIB_LIBRARY)
       MARK_AS_ADVANCED(QT_GTHREAD_LIBRARY)
     ENDIF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
@@ -1436,7 +1448,7 @@ IF (QT4_QMAKE_FOUND)
     ENDIF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY)
 
   ENDIF(QT_QCONFIG MATCHES "glib")
-  
+
   ## clock-monotonic, just see if we need to link with rt
   IF(QT_QCONFIG MATCHES "clock-monotonic")
     SET(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES})
@@ -1451,7 +1463,7 @@ IF (QT4_QMAKE_FOUND)
       ENDIF(QT_RT_LIBRARY)
     ENDIF(QT_POSIX_TIMERS)
   ENDIF(QT_QCONFIG MATCHES "clock-monotonic")
-    
+
   IF(Q_WS_X11)
     # X11 libraries Qt absolutely depends on
     QT_QUERY_QMAKE(QT_LIBS_X11 "QMAKE_LIBS_X11")
@@ -1468,25 +1480,25 @@ IF (QT4_QMAKE_FOUND)
 
     QT_QUERY_QMAKE(QT_LIBS_THREAD "QMAKE_LIBS_THREAD")
     SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QT_LIBS_THREAD})
-    
+
     QT_QUERY_QMAKE(QMAKE_LIBS_DYNLOAD "QMAKE_LIBS_DYNLOAD")
     SET (QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QMAKE_LIBS_DYNLOAD})
 
   ENDIF(Q_WS_X11)
-  
+
   IF(Q_WS_WIN)
     SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} imm32 winmm)
     SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ws2_32)
   ENDIF(Q_WS_WIN)
-  
+
   IF(Q_WS_MAC)
     SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework Carbon")
-    
+
     # Qt 4.0, 4.1, 4.2 use QuickTime
     IF(QT_VERSION_MINOR LESS 3)
       SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework QuickTime")
     ENDIF(QT_VERSION_MINOR LESS 3)
-    
+
     # Qt 4.2+ use AppKit
     IF(QT_VERSION_MINOR GREATER 1)
       SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework AppKit")
@@ -1497,7 +1509,7 @@ IF (QT4_QMAKE_FOUND)
 
   #######################################
   #
-  #       compatibility settings 
+  #       compatibility settings
   #
   #######################################
   # Backwards compatibility for CMake1.4 and 1.2
@@ -1507,7 +1519,7 @@ IF (QT4_QMAKE_FOUND)
   SET( QT_QT_LIBRARY "")
 
 ELSE(QT4_QMAKE_FOUND)
-   
+
    SET(QT_QMAKE_EXECUTABLE "${QT_QMAKE_EXECUTABLE}-NOTFOUND" CACHE FILEPATH "Invalid qmake found" FORCE)
    IF(Qt4_FIND_REQUIRED)
       IF(QT4_INSTALLED_VERSION_TOO_OLD)
@@ -1520,6 +1532,6 @@ ELSE(QT4_QMAKE_FOUND)
          MESSAGE(STATUS "The installed Qt version ${QTVERSION} is too old, at least version ${QT_MIN_VERSION} is required")
       ENDIF(QT4_INSTALLED_VERSION_TOO_OLD AND NOT Qt4_FIND_QUIETLY)
    ENDIF(Qt4_FIND_REQUIRED)
- 
+
 ENDIF (QT4_QMAKE_FOUND)