[SCM] QImageBlitz packaging branch, master, updated. debian/0.0.4-4-27-g4e05866

Modestas Vainius modax at alioth.debian.org
Wed Jul 28 20:20:45 UTC 2010


The following commit has been merged in the master branch:
commit ce970709020910319110d47f8519c853e0edb140
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Wed Jul 28 22:43:13 2010 +0300

    Refresh patches.
---
 debian/changelog                            |    1 +
 debian/patches/10_skip_cpu_check.diff       |    2 +-
 debian/patches/11_.gnu.note.diff            |    2 +-
 debian/patches/12_remove_FindQt4.cmake.diff |  383 +++++++++++++++++++++------
 4 files changed, 300 insertions(+), 88 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 701ce99..e075a9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ qimageblitz (1:0.0.6-1) UNRELEASED; urgency=low
   * Strip ./ from libqimageblitz-dev.install.
   * Sort install files.
   * Add a symbol file for libqimageblitz4 (based on 0.0.4).
+  * Refresh patches.
 
  -- Modestas Vainius <modestas at vainius.eu>  Mon, 16 Feb 2009 02:10:50 +0200
 
diff --git a/debian/patches/10_skip_cpu_check.diff b/debian/patches/10_skip_cpu_check.diff
index ca78738..7ea5399 100644
--- a/debian/patches/10_skip_cpu_check.diff
+++ b/debian/patches/10_skip_cpu_check.diff
@@ -1,6 +1,6 @@
 --- a/blitz/CMakeLists.txt
 +++ b/blitz/CMakeLists.txt
-@@ -17,13 +17,13 @@
+@@ -12,13 +12,13 @@ include_directories(
  
  CHECK_INCLUDE_FILE(stdint.h HAVE_STDINT_H)
  
diff --git a/debian/patches/11_.gnu.note.diff b/debian/patches/11_.gnu.note.diff
index 43ec36d..5490d38 100644
--- a/debian/patches/11_.gnu.note.diff
+++ b/debian/patches/11_.gnu.note.diff
@@ -1,6 +1,6 @@
 --- a/blitz/asm_scale.S
 +++ b/blitz/asm_scale.S
-@@ -814,3 +814,5 @@
+@@ -814,3 +814,5 @@ PR_(qimageScale_mmx_AARGBA):
  SIZE(qimageScale_mmx_AARGBA)
  
  #endif
diff --git a/debian/patches/12_remove_FindQt4.cmake.diff b/debian/patches/12_remove_FindQt4.cmake.diff
index a38fb6b..36cfaf3 100644
--- a/debian/patches/12_remove_FindQt4.cmake.diff
+++ b/debian/patches/12_remove_FindQt4.cmake.diff
@@ -1,15 +1,15 @@
 --- a/cmake/modules/FindQt4.cmake
 +++ /dev/null
-@@ -1,1254 +0,0 @@
+@@ -1,1465 +0,0 @@
 -# - Find QT 4
 -# 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 
+-# 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:
+-# of the following variables to true before doing INCLUDE(${QT_USE_FILE}):
 -#                    QT_DONT_USE_QTCORE
 -#                    QT_DONT_USE_QTGUI
 -#                    QT_USE_QT3SUPPORT
@@ -27,15 +27,60 @@
 -#                    QT_USE_QTUITOOLS
 -#                    QT_USE_QTDBUS
 -#                    QT_USE_QTSCRIPT
+-#                    QT_USE_QTASSISTANTCLIENT
+-#                    QT_USE_QTHELP
+-#                    QT_USE_QTWEBKIT
+-#                    QT_USE_QTXMLPATTERNS
+-#                    QT_USE_PHONON
 -#
--# All the libraries required are stored in a variable called QT_LIBRARIES.  
--# Add this variable to your TARGET_LINK_LIBRARIES.
+-# The file pointed to by QT_USE_FILE will set up your compile environment
+-# by adding include directories, preprocessor defines, and populate a
+-# QT_LIBRARIES variable containing all the Qt libraries and their dependencies.
+-# Add the QT_LIBRARIES variable to your TARGET_LINK_LIBRARIES.
+-#
+-# Typical usage could be something like:
+-#   FIND_PACKAGE(Qt4)
+-#   SET(QT_USE_QTXML 1)
+-#   INCLUDE(${QT_USE_FILE})
+-#   ADD_EXECUTABLE(myexe main.cpp)
+-#   TARGET_LINK_LIBRARIES(myexe ${QT_LIBRARIES})
+-#
+-#
+-# 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 ... )
--#  macro QT4_WRAP_UI(outfiles inputfile ... )
--#  macro QT4_ADD_RESOURCES(outfiles inputfile ... )
--#  macro QT4_AUTOMOC(inputfile ... )
+-#  macro QT4_WRAP_CPP(outfiles inputfile ... OPTIONS ...)
+-#        create moc code from a list of files containing Qt class with
+-#        the Q_OBJECT declaration.  Options may be given to moc, such as those found
+-#        when executing "moc -help"
+-#
+-#  macro QT4_WRAP_UI(outfiles inputfile ... OPTIONS ...)
+-#        create code from a list of Qt designer ui files.
+-#        Options may be given to uic, such as those found
+-#        when executing "uic -help"
+-#
+-#  macro QT4_ADD_RESOURCES(outfiles inputfile ... OPTIONS ...)
+-#        create code from a list of Qt resource files.
+-#        Options may be given to rcc, such as those found
+-#        when executing "rcc -help"
+-#
 -#  macro QT4_GENERATE_MOC(inputfile outputfile )
+-#        creates a rule to run moc on infile and create outfile.
+-#        Use this if for some reason QT4_WRAP_CPP() isn't appropriate, e.g.
+-#        because you need a custom filename for the moc file or something similar.
+-#
+-#  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 
+-#        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 
+-#        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 
@@ -60,11 +105,12 @@
 -#        If <classname> is provided, then it will be used as the classname of the
 -#        adaptor itself.
 -#
--#  macro QT4_GENERATE_DBUS_INTERFACE( header [interfacename] )
+-#  macro QT4_GENERATE_DBUS_INTERFACE( header [interfacename] OPTIONS ...)
 -#        generate the xml interface file from the given header.
 -#        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.
+-#        Options may be given to uic, such as those found when executing "qdbuscpp2xml --help"
 -#
 -#  QT_FOUND         If false, don't try to use Qt.
 -#  QT4_FOUND        If false, don't try to use Qt 4.
@@ -86,15 +132,30 @@
 -#  QT_QTSCRIPT_FOUND      True if QtScript was found.
 -#  QT_QTTEST_FOUND        True if QtTest was found.
 -#  QT_QTUITOOLS_FOUND     True if QtUiTools was found.
--#                      
+-#  QT_QTASSISTANTCLIENT_FOUND         True if QtAssistantClient was found.
+-#  QT_QTHELP_FOUND      True if QtHelp was found.
+-#  QT_QTWEBKIT_FOUND        True if QtWebKit was found.
+-#  QT_QTXMLPATTERNS_FOUND   True if QtXmlPatterns was found.
+-#  QT_PHONON_FOUND          True if phonon was found.
+-#
+-#
 -#  QT_DEFINITIONS   Definitions to use when compiling code that uses Qt.
+-#                   You do not need to use this if you include QT_USE_FILE.
+-#                   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 
 -#                   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_QT_INCLUDE_DIR           Path to "include/Qt" 
 -#  QT_QT3SUPPORT_INCLUDE_DIR   Path to "include/Qt3Support" 
@@ -113,6 +174,11 @@
 -#  QT_QTSVG_INCLUDE_DIR        Path to "include/QtSvg"
 -#  QT_QTSCRIPT_INCLUDE_DIR     Path to "include/QtScript"
 -#  QT_QTTEST_INCLUDE_DIR       Path to "include/QtTest"
+-#  QT_QTASSISTANTCLIENT_INCLUDE_DIR       Path to "include/QtAssistant"
+-#  QT_QTHELP_INCLUDE_DIR       Path to "include/QtHelp"
+-#  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
 -# 
@@ -156,6 +222,20 @@
 -# The qtmain library for Windows QT_QTMAIN_LIBRARY
 -#
 -# The QtUiTools library:      QT_QTUITOOLS_LIBRARY
+-
+-#
+-# The QtAssistantClient library:  QT_QTASSISTANTCLIENT_LIBRARY
+-#
+-# The QtHelp library:             QT_QTHELP_LIBRARY
+-#
+-# The QtWebKit library:           QT_QTWEBKIT_LIBRARY
+-#
+-# The QtXmlPatterns library:      QT_QTXMLPATTERNS_LIBRARY
+-#
+-# The Phonon library:             QT_PHONON_LIBRARY
+-
+-
+-
 -#  
 -# also defined, but NOT for general use are
 -#  QT_MOC_EXECUTABLE          Where to find the moc tool.
@@ -164,6 +244,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
@@ -189,6 +271,17 @@
 -
 -else (QT4_QMAKE_FOUND)
 -
+-# check that QT_NO_DEBUG is defined for release configurations
+-MACRO(QT_CHECK_FLAG_EXISTS FLAG VAR DOC)
+-  IF(NOT ${VAR} MATCHES "${FLAG}")
+-    SET(${VAR} "${${VAR}} ${FLAG}" 
+-      CACHE STRING "Flags used by the compiler during ${DOC} builds." FORCE)
+-  ENDIF(NOT ${VAR} MATCHES "${FLAG}")
+-ENDMACRO(QT_CHECK_FLAG_EXISTS FLAG VAR)
+-QT_CHECK_FLAG_EXISTS(-DQT_NO_DEBUG CMAKE_CXX_FLAGS_RELWITHDEBINFO "Release with Debug Info")
+-QT_CHECK_FLAG_EXISTS(-DQT_NO_DEBUG CMAKE_CXX_FLAGS_RELEASE "release")
+-QT_CHECK_FLAG_EXISTS(-DQT_NO_DEBUG CMAKE_CXX_FLAGS_MINSIZEREL "release minsize")
+-
 -INCLUDE(CheckSymbolExists)
 -INCLUDE(MacroAddFileDependencies)
 -INCLUDE(MacroPushRequiredVars)
@@ -229,10 +322,12 @@
 -
 -ENDMACRO(QT_QUERY_QMAKE)
 -
+-GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
 -# check for qmake
 -FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS
 -  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
 -  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+-  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
 -  $ENV{QTDIR}/bin
 -)
 -
@@ -313,6 +408,8 @@
 -    EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
 -      ARGS "-query QT_INSTALL_LIBS"
 -      OUTPUT_VARIABLE QT_LIBRARY_DIR_TMP )
+-    # make sure we have / and not \ as qmake gives on windows
+-    FILE(TO_CMAKE_PATH "${QT_LIBRARY_DIR_TMP}" QT_LIBRARY_DIR_TMP)
 -    IF(EXISTS "${QT_LIBRARY_DIR_TMP}")
 -      SET(QT_LIBRARY_DIR ${QT_LIBRARY_DIR_TMP} CACHE PATH "Qt library dir")
 -    ELSE(EXISTS "${QT_LIBRARY_DIR_TMP}")
@@ -334,45 +431,60 @@
 -  ENDIF (APPLE)
 -  
 -  # ask qmake for the binary dir
--  IF (NOT QT_BINARY_DIR)
+-  IF (QT_LIBRARY_DIR AND NOT QT_BINARY_DIR)
 -     EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}
--        ARGS "-query QT_INSTALL_BINS"
--        OUTPUT_VARIABLE qt_bins )
+-       ARGS "-query QT_INSTALL_BINS"
+-       OUTPUT_VARIABLE qt_bins )
+-     # make sure we have / and not \ as qmake gives on windows
+-     FILE(TO_CMAKE_PATH "${qt_bins}" qt_bins)
 -     SET(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "")
--  ENDIF (NOT QT_BINARY_DIR)
+-  ENDIF (QT_LIBRARY_DIR AND NOT QT_BINARY_DIR)
 -
 -  # ask qmake for the include dir
--  IF (NOT QT_HEADERS_DIR)
+-  IF (QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR)
 -      EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
 -        ARGS "-query QT_INSTALL_HEADERS" 
--        OUTPUT_VARIABLE qt_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 "")
--  ENDIF(NOT QT_HEADERS_DIR)
+-  ENDIF(QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR)
 -
 -
 -  # ask qmake for the documentation directory
--  IF (NOT QT_DOC_DIR)
+-  IF (QT_LIBRARY_DIR AND NOT QT_DOC_DIR)
 -    EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
 -      ARGS "-query QT_INSTALL_DOCS"
 -      OUTPUT_VARIABLE qt_doc_dir )
+-    # make sure we have / and not \ as qmake gives on windows
+-    FILE(TO_CMAKE_PATH "${qt_doc_dir}" qt_doc_dir)
 -    SET(QT_DOC_DIR ${qt_doc_dir} CACHE PATH "The location of the Qt docs")
--  ENDIF (NOT QT_DOC_DIR)
+-  ENDIF (QT_LIBRARY_DIR AND NOT QT_DOC_DIR)
 -
 -  # ask qmake for the mkspecs directory
--  IF (NOT QT_MKSPECS_DIR)
+-  IF (QT_LIBRARY_DIR AND NOT QT_MKSPECS_DIR)
 -    EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
 -      ARGS "-query QMAKE_MKSPECS"
--      OUTPUT_VARIABLE qt_mkspecs_dir )
--    SET(QT_MKSPECS_DIR ${qt_mkspecs_dir} CACHE PATH "The location of the Qt mkspecs")
--  ENDIF (NOT QT_MKSPECS_DIR)
+-      OUTPUT_VARIABLE qt_mkspecs_dirs )
+-    # do not replace : on windows as it might be a drive letter
+-    # and windows should already use ; as a separator
+-    IF(UNIX)
+-      STRING(REPLACE ":" ";" qt_mkspecs_dirs "${qt_mkspecs_dirs}")
+-    ENDIF(UNIX)
+-    FIND_PATH(QT_MKSPECS_DIR qconfig.pri PATHS ${qt_mkspecs_dirs}
+-      DOC "The location of the Qt mkspecs containing qconfig.pri"
+-      NO_DEFAULT_PATH )
+-  ENDIF (QT_LIBRARY_DIR AND NOT QT_MKSPECS_DIR)
 -
 -  # ask qmake for the plugins directory
--  IF (NOT QT_PLUGINS_DIR)
+-  IF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR)
 -    EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
 -      ARGS "-query QT_INSTALL_PLUGINS"
 -      OUTPUT_VARIABLE qt_plugins_dir )
+-    # make sure we have / and not \ as qmake gives on windows
+-    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")
--  ENDIF (NOT QT_PLUGINS_DIR)
+-  ENDIF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR)
 -  ########################################
 -  #
 -  #       Setting the INCLUDE-Variables
@@ -492,11 +604,12 @@
 -    NO_DEFAULT_PATH
 -    )
 -
--
--
 -  # Set QT_QTMOTIF_INCLUDE_DIR
 -  IF(Q_WS_X11)
--    FIND_PATH(QT_QTMOTIF_INCLUDE_DIR QtMotif PATHS ${QT_INCLUDE_DIR}/QtMotif NO_DEFAULT_PATH )
+-    FIND_PATH(QT_QTMOTIF_INCLUDE_DIR QtMotif 
+-      PATHS 
+-      ${QT_INCLUDE_DIR}/QtMotif 
+-      NO_DEFAULT_PATH )
 -  ENDIF(Q_WS_X11)
 -
 -  # Set QT_QTNETWORK_INCLUDE_DIR
@@ -544,6 +657,7 @@
 -    PATHS
 -    ${QT_INCLUDE_DIR}/QtAssistant
 -    ${QT_HEADERS_DIR}/QtAssistant
+-    ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
 -    NO_DEFAULT_PATH
 -    )
 -
@@ -551,7 +665,8 @@
 -  FIND_PATH(QT_QTDESIGNER_INCLUDE_DIR QDesignerComponents
 -    PATHS
 -    ${QT_INCLUDE_DIR}/QtDesigner
--    ${QT_HEADERS_DIR}/QtDesigner
+-    ${QT_HEADERS_DIR}/QtDesigner 
+-    ${QT_LIBRARY_DIR}/QtDesigner.framework/Headers
 -    NO_DEFAULT_PATH
 -    )
 -
@@ -563,7 +678,6 @@
 -    NO_DEFAULT_PATH
 -    )
 -
--
 -  # Set QT_QTDBUS_INCLUDE_DIR
 -  FIND_PATH(QT_QTDBUS_INCLUDE_DIR QtDBus
 -    PATHS
@@ -571,13 +685,51 @@
 -    ${QT_HEADERS_DIR}/QtDBus
 -    NO_DEFAULT_PATH
 -    )
+-  
+-  # Set QT_QTASSISTANTCLIENT_INCLUDE_DIR
+-  FIND_PATH(QT_QTASSISTANTCLIENT_INCLUDE_DIR QAssistantClient
+-    PATHS
+-    ${QT_INCLUDE_DIR}/QtAssistant
+-    ${QT_HEADERS_DIR}/QtAssistant
+-    NO_DEFAULT_PATH
+-    )
+-  
+-  # Set QT_QTHELP_INCLUDE_DIR
+-  FIND_PATH(QT_QTHELP_INCLUDE_DIR QtHelp
+-    PATHS
+-    ${QT_INCLUDE_DIR}/QtHelp
+-    ${QT_HEADERS_DIR}/QtHelp
+-    NO_DEFAULT_PATH
+-    )
+-  
+-  # Set QT_QTWEBKIT_INCLUDE_DIR
+-  FIND_PATH(QT_QTWEBKIT_INCLUDE_DIR QtWebKit
+-    PATHS
+-    ${QT_INCLUDE_DIR}/QtWebKit
+-    ${QT_HEADERS_DIR}/QtWebKit
+-    NO_DEFAULT_PATH
+-    )
+-  
+-  # Set QT_QTXMLPATTERNS_INCLUDE_DIR
+-  FIND_PATH(QT_QTXMLPATTERNS_INCLUDE_DIR QtXmlPatterns
+-    PATHS
+-    ${QT_INCLUDE_DIR}/QtXmlPatterns
+-    ${QT_HEADERS_DIR}/QtXmlPatterns
+-    NO_DEFAULT_PATH
+-    )
+-  
+-  # Set QT_PHONON_INCLUDE_DIR
+-  FIND_PATH(QT_PHONON_INCLUDE_DIR phonon
+-    PATHS
+-    ${QT_INCLUDE_DIR}/phonon
+-    NO_DEFAULT_PATH
+-    )
 -
 -  # Make variables changeble to the advanced user
 -  MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_QT_INCLUDE_DIR QT_DOC_DIR QT_MKSPECS_DIR QT_PLUGINS_DIR)
 -
 -  # Set QT_INCLUDES
--  SET( QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default )
--
+-  SET( QT_INCLUDES ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR} )
 -
 -  ########################################
 -  #
@@ -658,6 +810,28 @@
 -      SET(QT_QTTEST_FOUND FALSE)
 -    ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtTest.framework)
 -
+-    IF(EXISTS ${QT_LIBRARY_DIR}/QtAssistantClient.framework)
+-      SET(QT_QTASSISTANTCLIENT_FOUND TRUE)
+-      SET(QT_QTASSISTANTCLIENT_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtAssistantClient" CACHE STRING "The QtAssistantClient library.")
+-    ELSE(EXISTS ${QT_LIBRARY_DIR}/QtAssistantClient.framework)
+-      SET(QT_QTASSISTANTCLIENT_FOUND FALSE)
+-    ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtAssistantClient.framework)
+-
+-    IF(EXISTS ${QT_LIBRARY_DIR}/QtWebKit.framework)
+-      SET(QT_QTWEBKIT_FOUND TRUE)
+-      SET(QT_QTWEBKIT_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtWebKit" CACHE STRING "The QtWebKit library.")
+-    ELSE(EXISTS ${QT_LIBRARY_DIR}/QtWebKit.framework)
+-      SET(QT_QTWEBKIT_FOUND FALSE)
+-    ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtWebKit.framework)
+-
+-    IF(EXISTS ${QT_LIBRARY_DIR}/QtXmlPatterns.framework)
+-      SET(QT_QTXMLPATTERNS_FOUND TRUE)
+-      SET(QT_QTXMLPATTERNS_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtXmlPatterns" CACHE STRING "The QtXmlPatterns library.")
+-    ELSE(EXISTS ${QT_LIBRARY_DIR}/QtXmlPatterns.framework)
+-      SET(QT_QTXMLPATTERNS_FOUND FALSE)
+-    ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtXmlPatterns.framework)
+-
+-
 -    # WTF?  why don't we have frameworks?  :P
 -    # Set QT_QTUITOOLS_LIBRARY
 -    FIND_LIBRARY(QT_QTUITOOLS_LIBRARY NAMES QtUiTools QtUiTools4 PATHS ${QT_LIBRARY_DIR} )
@@ -667,47 +841,58 @@
 -  ELSE (QT_USE_FRAMEWORKS)
 -    
 -    # Set QT_QTCORE_LIBRARY by searching for a lib with "QtCore."  as part of the filename
--    FIND_LIBRARY(QT_QTCORE_LIBRARY NAMES QtCore QtCore4 QtCored4          PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH )
+-    FIND_LIBRARY(QT_QTCORE_LIBRARY NAMES QtCore QtCore4 QtCored4 QtCore_debug         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH )
 -
 -    # Set QT_QT3SUPPORT_LIBRARY
--    FIND_LIBRARY(QT_QT3SUPPORT_LIBRARY NAMES Qt3Support Qt3Support4 Qt3Supportd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-    FIND_LIBRARY(QT_QT3SUPPORT_LIBRARY NAMES Qt3Support Qt3Support_debug Qt3Support4 Qt3Supportd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 -
 -    # Set QT_QTGUI_LIBRARY
--    FIND_LIBRARY(QT_QTGUI_LIBRARY NAMES QtGui QtGui4 QtGuid4            PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-    FIND_LIBRARY(QT_QTGUI_LIBRARY NAMES QtGui QtGui_debug QtGui_debug QtGui4 QtGuid4            PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 -
 -    # Set QT_QTMOTIF_LIBRARY
 -    IF(Q_WS_X11)
--      FIND_LIBRARY(QT_QTMOTIF_LIBRARY NAMES QtMotif          PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-      FIND_LIBRARY(QT_QTMOTIF_LIBRARY NAMES QtMotif  QtMotif_debug PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 -    ENDIF(Q_WS_X11)
 -
 -    # Set QT_QTNETWORK_LIBRARY
--    FIND_LIBRARY(QT_QTNETWORK_LIBRARY NAMES QtNetwork QtNetwork4 QtNetworkd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-    FIND_LIBRARY(QT_QTNETWORK_LIBRARY NAMES QtNetwork QtNetwork_debug QtNetwork4 QtNetworkd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 -
 -    # Set QT_QTNSPLUGIN_LIBRARY
--    FIND_LIBRARY(QT_QTNSPLUGIN_LIBRARY NAMES QtNsPlugin      PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-    FIND_LIBRARY(QT_QTNSPLUGIN_LIBRARY NAMES QtNsPlugin QtNsPlugin_debug PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 -
 -    # Set QT_QTOPENGL_LIBRARY
--    FIND_LIBRARY(QT_QTOPENGL_LIBRARY NAMES QtOpenGL QtOpenGL4 QtOpenGLd4    PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-    FIND_LIBRARY(QT_QTOPENGL_LIBRARY NAMES QtOpenGL QtOpenGL_debug QtOpenGL4 QtOpenGLd4    PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 -
 -    # Set QT_QTSQL_LIBRARY
--    FIND_LIBRARY(QT_QTSQL_LIBRARY NAMES QtSql QtSql4 QtSqld4       PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-    FIND_LIBRARY(QT_QTSQL_LIBRARY NAMES QtSql QtSql_debug QtSql4 QtSqld4       PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 -
 -    # Set QT_QTXML_LIBRARY
--    FIND_LIBRARY(QT_QTXML_LIBRARY NAMES QtXml QtXml4 QtXmld4       PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-    FIND_LIBRARY(QT_QTXML_LIBRARY NAMES QtXml QtXml_debug QtXml4 QtXmld4       PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 -
 -    # Set QT_QTSVG_LIBRARY
--    FIND_LIBRARY(QT_QTSVG_LIBRARY NAMES QtSvg QtSvg4 QtSvgd4       PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-    FIND_LIBRARY(QT_QTSVG_LIBRARY NAMES QtSvg QtSvg_debug QtSvg4 QtSvgd4       PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 -
 -    # Set QT_QTSCRIPT_LIBRARY
--    FIND_LIBRARY(QT_QTSCRIPT_LIBRARY NAMES QtScript QtScript4 QtScriptd4   PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-    FIND_LIBRARY(QT_QTSCRIPT_LIBRARY NAMES QtScript QtScript_debug QtScript4 QtScriptd4   PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 -
 -    # Set QT_QTUITOOLS_LIBRARY
--    FIND_LIBRARY(QT_QTUITOOLS_LIBRARY NAMES QtUiTools QtUiTools4 QtUiToolsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-    FIND_LIBRARY(QT_QTUITOOLS_LIBRARY NAMES QtUiTools QtUiTools_debug QtUiTools4 QtUiToolsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 -
 -    # Set QT_QTTEST_LIBRARY
--    FIND_LIBRARY(QT_QTTEST_LIBRARY NAMES QtTest QtTest4 QtTestd4          PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-    FIND_LIBRARY(QT_QTTEST_LIBRARY NAMES QtTest QtTest_debug QtTest4 QtTestd4          PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+-    FIND_LIBRARY(QT_QTDBUS_LIBRARY NAMES QtDBus QtDBus_debug QtDBus4 QtDBusd4         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+-    FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY NAMES QtAssistantClient QtAssistantClient_debug QtAssistantClient4 QtAssistantClientd4         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+-    FIND_LIBRARY(QT_QTHELP_LIBRARY NAMES QtHelp QtHelp_debug QtHelp4 QtHelpd4         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+-    FIND_LIBRARY(QT_QTWEBKIT_LIBRARY NAMES QtWebKit QtWebKit_debug QtWebKit4 QtWebKitd4         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+-    FIND_LIBRARY(QT_QTXMLPATTERNS_LIBRARY NAMES QtXmlPatterns QtXmlPatterns_debug QtXmlPatterns4 QtXmlPatternsd4         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+-    FIND_LIBRARY(QT_PHONON_LIBRARY NAMES phonon phonon4 phonon_debug phonond4    PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 -
--    FIND_LIBRARY(QT_QTDBUS_LIBRARY NAMES QtDBus QtDBus4 QtDBusd4         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 -
 -    IF(MSVC)
 -      FIND_LIBRARY(QT_QTCORE_LIBRARY_RELEASE    NAMES QtCore4            PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
@@ -747,7 +932,7 @@
 -
 -  IF( NOT QT_QTCORE_LIBRARY )
 -    IF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
--      MESSAGE( FATAL_ERROR "Could NOT find QtCore. Check CMakeFiles/CMakeError.log for more details.")
+-      MESSAGE( FATAL_ERROR "Could NOT find QtCore. Check ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log for more details.")
 -    ENDIF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
 -  ENDIF( NOT QT_QTCORE_LIBRARY )
 -
@@ -755,10 +940,10 @@
 -  FIND_LIBRARY(QT_QTASSISTANT_LIBRARY NAMES QtAssistantClient QtAssistantClient4 QtAssistant QtAssistant4 QtAssistantd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 -
 -  # Set QT_QTDESIGNER_LIBRARY
--  FIND_LIBRARY(QT_QTDESIGNER_LIBRARY NAMES QtDesigner QtDesigner4 QtDesignerd4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
+-  FIND_LIBRARY(QT_QTDESIGNER_LIBRARY NAMES QtDesigner QtDesigner_debug QtDesigner4 QtDesignerd4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
 -
 -  # Set QT_QTDESIGNERCOMPONENTS_LIBRARY
--  FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY NAMES QtDesignerComponents QtDesignerComponents4 QtDesignerComponentsd4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
+-  FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY NAMES QtDesignerComponents QtDesignerComponents_debug QtDesignerComponents4 QtDesignerComponentsd4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
 -
 -  # Set QT_QTMAIN_LIBRARY
 -  IF(WIN32)
@@ -805,7 +990,7 @@
 -    
 -    IF (QT_${basename}_INCLUDE_DIR)
 -      #add the include directory to QT_INCLUDES
--      SET(QT_INCLUDES ${QT_INCLUDES} "${QT_${basename}_INCLUDE_DIR}")
+-      SET(QT_INCLUDES "${QT_${basename}_INCLUDE_DIR}" ${QT_INCLUDES})
 -    ENDIF (QT_${basename}_INCLUDE_DIR)
 -
 -    # Make variables changeble to the advanced user
@@ -831,8 +1016,12 @@
 -  _QT4_ADJUST_LIB_VARS(QTUITOOLS)
 -  _QT4_ADJUST_LIB_VARS(QTTEST)
 -  _QT4_ADJUST_LIB_VARS(QTDBUS)
--  
--  
+-  _QT4_ADJUST_LIB_VARS(QTASSISTANTCLIENT)
+-  _QT4_ADJUST_LIB_VARS(QTHELP)
+-  _QT4_ADJUST_LIB_VARS(QTWEBKIT)
+-  _QT4_ADJUST_LIB_VARS(QTXMLPATTERNS)
+-  _QT4_ADJUST_LIB_VARS(PHONON)
+-
 -  # platform dependent libraries
 -  IF(Q_WS_X11)
 -    _QT4_ADJUST_LIB_VARS(QTMOTIF)
@@ -854,8 +1043,10 @@
 -  QT_QUERY_QMAKE(QT_MOC_EXECUTABLE_INTERNAL "QMAKE_MOC")
 -  QT_QUERY_QMAKE(QT_UIC_EXECUTABLE_INTERNAL "QMAKE_UIC")
 -
+-  # make sure we have / and not \ as qmake gives on windows
 -  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 
 -    "${QT_UIC_EXECUTABLE_INTERNAL}" QT_UIC_EXECUTABLE_INTERNAL)
 -
@@ -888,6 +1079,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)
@@ -898,7 +1101,9 @@
 -
 -
 -
--  MARK_AS_ADVANCED( QT_UIC_EXECUTABLE QT_UIC3_EXECUTABLE QT_MOC_EXECUTABLE QT_RCC_EXECUTABLE QT_DBUSXML2CPP_EXECUTABLE QT_DBUSCPP2XML_EXECUTABLE)
+-  MARK_AS_ADVANCED( QT_UIC_EXECUTABLE QT_UIC3_EXECUTABLE QT_MOC_EXECUTABLE
+-    QT_RCC_EXECUTABLE QT_DBUSXML2CPP_EXECUTABLE QT_DBUSCPP2XML_EXECUTABLE
+-    QT_LUPDATE_EXECUTABLE QT_LRELEASE_EXECUTABLE)
 -
 -  ######################################
 -  #
@@ -906,6 +1111,23 @@
 -  #
 -  ######################################
 -
+-  MACRO (QT4_EXTRACT_OPTIONS _qt4_files _qt4_options)
+-    SET(${_qt4_files})
+-    SET(${_qt4_options})
+-    SET(_QT4_DOING_OPTIONS FALSE)
+-    FOREACH(_currentArg ${ARGN})
+-      IF ("${_currentArg}" STREQUAL "OPTIONS")
+-        SET(_QT4_DOING_OPTIONS TRUE)
+-      ELSE ("${_currentArg}" STREQUAL "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) 
+-  ENDMACRO (QT4_EXTRACT_OPTIONS)
+-
 -  MACRO (QT4_GET_MOC_INC_DIRS _moc_INC_DIRS)
 -     SET(${_moc_INC_DIRS})
 -     GET_DIRECTORY_PROPERTY(_inc_DIRS INCLUDE_DIRECTORIES)
@@ -913,6 +1135,7 @@
 -     FOREACH(_current ${_inc_DIRS})
 -        SET(${_moc_INC_DIRS} ${${_moc_INC_DIRS}} "-I" ${_current})
 -     ENDFOREACH(_current ${_inc_DIRS})
+-
 -  ENDMACRO(QT4_GET_MOC_INC_DIRS)
 -
 -
@@ -945,20 +1168,20 @@
 -
 -
 -  # QT4_WRAP_CPP(outfiles inputfile ... )
--  # TODO  perhaps add support for -D, -U and other minor options
 -
 -  MACRO (QT4_WRAP_CPP outfiles )
 -    # get include dirs
 -    QT4_GET_MOC_INC_DIRS(moc_includes)
+-    QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
 -
--    FOREACH (it ${ARGN})
+-    FOREACH (it ${moc_files})
 -      GET_FILENAME_COMPONENT(it ${it} ABSOLUTE)
 -      GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
 -
 -      SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/moc_${outfile}.cxx)
 -      ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
 -        COMMAND ${QT_MOC_EXECUTABLE}
--        ARGS ${moc_includes} -o ${outfile} ${it}
+-        ARGS ${moc_includes} ${moc_options} -o ${outfile} ${it}
 -        DEPENDS ${it})
 -      SET(${outfiles} ${${outfiles}} ${outfile})
 -    ENDFOREACH(it)
@@ -969,14 +1192,15 @@
 -  # QT4_WRAP_UI(outfiles inputfile ... )
 -
 -  MACRO (QT4_WRAP_UI outfiles )
+-    QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
 -
--    FOREACH (it ${ARGN})
+-    FOREACH (it ${ui_files})
 -      GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
 -      GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
 -      SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
 -      ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
 -        COMMAND ${QT_UIC_EXECUTABLE}
--        ARGS -o ${outfile} ${infile}
+-        ARGS ${ui_options} -o ${outfile} ${infile}
 -        MAIN_DEPENDENCY ${infile})
 -      SET(${outfiles} ${${outfiles}} ${outfile})
 -    ENDFOREACH (it)
@@ -985,11 +1209,11 @@
 -
 -
 -  # QT4_ADD_RESOURCES(outfiles inputfile ... )
--  # TODO  perhaps consider adding support for compression and root options to rcc
 -
 -  MACRO (QT4_ADD_RESOURCES outfiles )
+-    QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN})
 -
--    FOREACH (it ${ARGN})
+-    FOREACH (it ${rcc_files})
 -      GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE)
 -      GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
 -      GET_FILENAME_COMPONENT(rc_path ${infile} PATH)
@@ -1009,7 +1233,7 @@
 -      ENDFOREACH(_RC_FILE)
 -      ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
 -        COMMAND ${QT_RCC_EXECUTABLE}
--        ARGS -name ${outfilename} -o ${outfile} ${infile}
+-        ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile}
 -        MAIN_DEPENDENCY ${infile}
 -        DEPENDS ${_RC_DEPENDS})
 -      SET(${outfiles} ${${outfiles}} ${outfile})
@@ -1047,7 +1271,8 @@
 -    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)
@@ -1057,21 +1282,11 @@
 -        QT4_ADD_DBUS_INTERFACE(${_sources} ${_infile} ${_basename}interface)
 -     ENDFOREACH (_current_FILE)
 -  ENDMACRO(QT4_ADD_DBUS_INTERFACES)
--
--  MACRO(QT4_ADD_DBUS_INTERFACE_NO_NAMESPACE _sources _interface _basename)
--    MESSAGE(SEND_ERROR "QT4_ADD_DBUS_INTERFACE_NO_NAMESPACE() is deprecated. Use the following instead:
--SET_SOURCE_FILES_PROPERTIES(<interface> PROPERTIES NO_NAMESPACE TRUE)
--QT4_ADD_DBUS_INTERFACE(<srcList> <interface> <basename>)\n")
--  ENDMACRO(QT4_ADD_DBUS_INTERFACE_NO_NAMESPACE)
--
--  MACRO(QT4_ADD_DBUS_INTERFACES_NO_NAMESPACE _sources)
--    MESSAGE(SEND_ERROR "QT4_ADD_DBUS_INTERFACES_NO_NAMESPACE() is deprecated. Use the following instead:
--SET_SOURCE_FILES_PROPERTIES(<files> PROPERTIES NO_NAMESPACE TRUE)
--QT4_ADD_DBUS_INTERFACES(<srcList> <files>)\n")
--  ENDMACRO(QT4_ADD_DBUS_INTERFACES_NO_NAMESPACE)
 -  
--  MACRO(QT4_GENERATE_DBUS_INTERFACE _header) # _customName )
--    SET(_customName "${ARGV1}")
+-  
+-  MACRO(QT4_GENERATE_DBUS_INTERFACE _header) # _customName OPTIONS -some -options )
+-    QT4_EXTRACT_OPTIONS(_customName _qt4_dbus_options ${ARGN})
+-
 -    GET_FILENAME_COMPONENT(_in_file ${_header} ABSOLUTE)
 -    GET_FILENAME_COMPONENT(_basename ${_header} NAME_WE)
 -    
@@ -1082,7 +1297,7 @@
 -    ENDIF (_customName)
 -  
 -    ADD_CUSTOM_COMMAND(OUTPUT ${_target}
--        COMMAND ${QT_DBUSCPP2XML_EXECUTABLE} ${_in_file} > ${_target}
+-        COMMAND ${QT_DBUSCPP2XML_EXECUTABLE} ${_qt4_dbus_options} ${_in_file} > ${_target}
 -        DEPENDS ${_in_file}
 -    )
 -  ENDMACRO(QT4_GENERATE_DBUS_INTERFACE)
@@ -1131,7 +1346,7 @@
 -
 -         GET_FILENAME_COMPONENT(_abs_FILE ${_current_FILE} ABSOLUTE)
 -         # if "SKIP_AUTOMOC" is set to true, we will not handle this file here.
--         # here. this is required to make bouic work correctly:
+-         # This is required to make uic work correctly:
 -         # we need to add generated .cpp files to the sources (to compile them),
 -         # but we cannot let automoc handle them, as the .cpp files don't exist yet when
 -         # cmake is run for the very first time on them -> however the .cpp files might
@@ -1179,11 +1394,7 @@
 -  IF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
 -    SET( QT4_FOUND "YES" )
 -    IF( NOT Qt4_FIND_QUIETLY)
--      IF (WIN32)
--        MESSAGE(STATUS "Found Qt-Version ${QTVERSION} with qmake at ${QT_QMAKE_EXECUTABLE}")
--      ELSE (WIN32)
--        MESSAGE(STATUS "Found Qt-Version ${QTVERSION}")
--      ENDIF (WIN32)
+-      MESSAGE(STATUS "Found Qt-Version ${QTVERSION} (using ${QT_QMAKE_EXECUTABLE})")
 -    ENDIF( NOT Qt4_FIND_QUIETLY)
 -  ELSE( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
 -    SET( QT4_FOUND "NO")

-- 
QImageBlitz packaging



More information about the pkg-kde-commits mailing list