Merge topic 'findqt4-withqt5'

161a793 FindQt4: Fix QT_QMAKE{_QMAKE => }_EXECUTABLE typo

Modules/FindQt4.cmake

@@ -561,7 +561,7 @@ function(_QT4_FIND_QMAKE QMAKE_NAMES QMAKE_RESULT VERSION_RESULT)
   endif()
 
 
-  set(${QMAKE_RESULT} "${QT_QMAKE_QMAKE_EXECUTABLE}" PARENT_SCOPE)
+  set(${QMAKE_RESULT} "${QT_QMAKE_EXECUTABLE}" PARENT_SCOPE)
   set(${VERSION_RESULT} "${QTVERSION}" PARENT_SCOPE)
 endfunction()