Browse Source

ENH: add new place to search for qt4 in registry

Bill Hoffman 20 years ago
parent
commit
74918bfc87
2 changed files with 2 additions and 0 deletions
  1. 1 0
      Modules/FindQt.cmake
  2. 1 0
      Modules/FindQt4.cmake

+ 1 - 0
Modules/FindQt.cmake

@@ -62,6 +62,7 @@ ENDIF(QT_QMAKE_EXECUTABLE)
 FIND_FILE( QT4_QGLOBAL_H_FILE qglobal.h
   "${QT_SEARCH_PATH}/Qt/include"
   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/include/Qt"
+  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/include/Qt"
   ${qt_headers}/Qt
   $ENV{QTDIR}/include/Qt
   /usr/local/qt/include/Qt

+ 1 - 0
Modules/FindQt4.cmake

@@ -128,6 +128,7 @@ ENDIF(GLOB_TEMP_VAR)
 # check for qmake
 FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS 
   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
   $ENV{QTDIR}/bin
   ${QT4_PATHS}
 )