From 74918bfc8716dcea71f98da813f05d30ddc476eb Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Mon, 12 Sep 2005 11:43:24 -0400
Subject: [PATCH] ENH: add new place to search for qt4 in registry

---
 Modules/FindQt.cmake  | 1 +
 Modules/FindQt4.cmake | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake
index 64942f32c..41e277630 100644
--- a/Modules/FindQt.cmake
+++ b/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
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 347640a48..c44fe2edb 100644
--- a/Modules/FindQt4.cmake
+++ b/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}
 )