diff options
Diffstat (limited to 'modules/FindQt4.cmake')
| -rw-r--r-- | modules/FindQt4.cmake | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 3ed05c06..df2c006e 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -727,7 +727,7 @@ IF (QT4_QMAKE_FOUND) PATHS ${QT_INCLUDE_DIR}/QtWebKit ${QT_HEADERS_DIR}/QtWebKit - ${QT_LIBRARY_DIR}/QtWebKit.framework/Headers + ${QT_LIBRARY_DIR}/QtWebkit.framework/Headers NO_DEFAULT_PATH ) @@ -738,11 +738,13 @@ IF (QT4_QMAKE_FOUND) ${QT_HEADERS_DIR}/QtXmlPatterns NO_DEFAULT_PATH ) - + # Set QT_PHONON_INCLUDE_DIR - FIND_PATH(QT_PHONON_INCLUDE_DIR phonon + # Qt >= 4.5.3 (or kde-qt-4.5.2 which has the fix too) : Phonon/ClassName is inside include/phonon + # With previous versions of Qt, this could not work; upgrade Qt or use a standalone phonon + FIND_PATH(QT_PHONON_INCLUDE_DIR Phonon PATHS - ${QT_INCLUDE_DIR}/phonon + ${QT_HEADERS_DIR}/phonon NO_DEFAULT_PATH ) @@ -1335,7 +1337,7 @@ IF (QT4_QMAKE_FOUND) ENDIF (_customName) ADD_CUSTOM_COMMAND(OUTPUT ${_target} - COMMAND ${QT_DBUSCPP2XML_EXECUTABLE} ${_qt4_dbus_options} ${_in_file} -o ${_target} + COMMAND ${QT_DBUSCPP2XML_EXECUTABLE} ${_qt4_dbus_options} ${_in_file} > ${_target} DEPENDS ${_in_file} ) ENDMACRO(QT4_GENERATE_DBUS_INTERFACE) |