diff options
Diffstat (limited to 'devel/cmake/files/patch-Modules_FindQt4.cmake')
| -rw-r--r-- | devel/cmake/files/patch-Modules_FindQt4.cmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/devel/cmake/files/patch-Modules_FindQt4.cmake b/devel/cmake/files/patch-Modules_FindQt4.cmake index 3cb84ea59ec2..3c97ce18db88 100644 --- a/devel/cmake/files/patch-Modules_FindQt4.cmake +++ b/devel/cmake/files/patch-Modules_FindQt4.cmake @@ -1,11 +1,11 @@ ---- Modules/FindQt4.cmake.orig 2009-05-10 21:46:40.000000000 +0200 -+++ Modules/FindQt4.cmake 2009-05-10 21:47:58.000000000 +0200 -@@ -336,7 +336,7 @@ - - GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME) +--- ./Modules/FindQt4.cmake.orig 2010-03-16 23:29:30.000000000 +0300 ++++ ./Modules/FindQt4.cmake 2010-03-26 22:48:58.291402760 +0300 +@@ -392,7 +392,7 @@ # check for qmake --FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS -+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 qmake4 qmake PATHS + # Debian uses qmake-qt4 + # macports' Qt uses qmake-mac +-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS ++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 qmake qmake4 qmake-mac PATHS "[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" |