From 26d31fc2a08ec2f3b521a3cb253b6209c5dee912 Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Tue, 3 Oct 2006 14:39:05 -0400
Subject: BUG: fix for bug#3720

---
 Modules/FindQt4.cmake | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 6ac94c3..57853ef 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -200,6 +200,15 @@ IF (QT_QMAKE_EXECUTABLE)
    SET(QT4_QMAKE_FOUND FALSE)
    
    EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION)
+   # check for qt3 qmake and then try and find qmake-qt4 in the path
+   IF("${QTVERSION}" MATCHES "Unknown")
+     SET(QT_QMAKE_EXECUTABLE NOTFOUND)
+     FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 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
+       )
+   ENDIF("${QTVERSION}" MATCHES "Unknown")
 
    # check that we found the Qt4 qmake, Qt3 qmake output won't match here
    STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" qt_version_tmp "${QTVERSION}")
-- 
cgit v0.12