From 5a6a3d4342f835b2d7adf8f1679a2b70bc3897ef Mon Sep 17 00:00:00 2001 From: Clinton Stimpson Date: Wed, 15 Aug 2012 18:20:16 -0600 Subject: [PATCH] FindQt4: Give precedence to QTDIR environment variable, if set. --- Modules/FindQt4.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index fac8579dc..726d86c90 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -487,10 +487,10 @@ get_filename_component(qt_install_version "[HKEY_CURRENT_USER\\Software\\trollte # Debian uses qmake-qt4 # macports' Qt uses qmake-mac find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS + $ENV{QTDIR}/bin "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin" - $ENV{QTDIR}/bin DOC "The qmake executable for the Qt installation to use" )