ENH: more findqt fixes

Modules/FindQt.cmake

@@ -42,8 +42,8 @@ SET(GLOB_TEMP_VAR)
 
 # now find qmake
 FIND_PROGRAM(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin")
-IF(QT_QMAKE_EXECUTABLE)
-  EXEC_PROGRAM(${QMAKE_PATH} ARGS "-query QT_VERSION"
+IF(QT_QMAKE_EXECUTABLE_FINDQT)
+  EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE_FINDQT} ARGS "-query QT_VERSION"
     OUTPUT_VARIABLE QTVERSION)
   IF(QTVERSION MATCHES "4.*")
     SET(QT4_INSTALLED TRUE)
@@ -51,10 +51,10 @@ IF(QT_QMAKE_EXECUTABLE)
   IF(QTVERSION MATCHES "Unknown")
     SET(QT3_INSTALLED TRUE)
   ENDIF(QTVERSION MATCHES "Unknown")
-ENDIF(QT_QMAKE_EXECUTABLE)
+ENDIF(QT_QMAKE_EXECUTABLE_FINDQT)
 
-IF(QT_QMAKE_EXECUTABLE)
-  EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
+IF(QT_QMAKE_EXECUTABLE_FINDQT)
+  EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE_FINDQT}
     ARGS "-query QT_INSTALL_HEADERS" 
     OUTPUT_VARIABLE qt_headers )
 ENDIF(QT_QMAKE_EXECUTABLE)

Modules/FindQt4.cmake

@@ -339,7 +339,7 @@ IF(QT4_QMAKE_FOUND)
       CACHE STRING "The QtNetwork library.")
     SET(QT_QTOPENGL_LIBRARY "-framework QtOpenGL"
       CACHE STRING "The QtOpenGL library.")
-    SET(QT_QTOPENGL_LIBRARY_GUI "-framework QtOpenGL"
+    SET(QT_QTOPENGL_LIBRARY_DEBUG "-framework QtOpenGL"
       CACHE STRING "The QtOpenGL library.")
     SET(QT_QTSQL_LIBRARY "-framework QtSql"
       CACHE STRING "The QtSql library.")