From 2251970c1d3d8820e47080cb92f923311bb46b7f Mon Sep 17 00:00:00 2001 From: Andy Cedilnik Date: Tue, 28 Feb 2006 11:13:44 -0500 Subject: [PATCH] ENH: Add support for debian having both qt3 and qt4 --- Modules/FindQt4.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 6d1ef9b05..550f5fd77 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -126,7 +126,7 @@ IF(GLOB_TEMP_VAR) SET(QT4_PATHS ${QT4_PATHS} ${GLOB_TEMP_VAR}) ENDIF(GLOB_TEMP_VAR) # check for qmake -FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS +FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 qmak 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