diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2009-08-04 19:33:08 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2009-08-04 19:33:08 +0000 |
| commit | e4a16c160872cdf202f5fc612a2542966e0ac3af (patch) | |
| tree | 8bfb163441e159803b1576bde2f7efdb4028dec8 /devel/cmake/files/patch-Modules_FindQt4.cmake | |
| parent | - Update py-qt4 to py-qt4.5.4 (diff) | |
- Update to 2.6.4
Notes
Notes:
svn path=/head/; revision=238900
Diffstat (limited to 'devel/cmake/files/patch-Modules_FindQt4.cmake')
| -rw-r--r-- | devel/cmake/files/patch-Modules_FindQt4.cmake | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/devel/cmake/files/patch-Modules_FindQt4.cmake b/devel/cmake/files/patch-Modules_FindQt4.cmake index 13f6a82f03ca..3cb84ea59ec2 100644 --- a/devel/cmake/files/patch-Modules_FindQt4.cmake +++ b/devel/cmake/files/patch-Modules_FindQt4.cmake @@ -1,6 +1,6 @@ ---- ./Modules/FindQt4.cmake.orig 2009-02-21 23:36:50.000000000 +0300 -+++ ./Modules/FindQt4.cmake 2009-03-20 13:20:18.000000000 +0300 -@@ -319,7 +319,7 @@ +--- 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) # check for qmake @@ -9,19 +9,3 @@ "[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" -@@ -855,13 +855,13 @@ - ) - - FIND_PROGRAM(QT_LUPDATE_EXECUTABLE -- NAMES lupdate -+ NAMES lupdate-qt4 - PATHS ${QT_BINARY_DIR} - NO_DEFAULT_PATH - ) - - FIND_PROGRAM(QT_LRELEASE_EXECUTABLE -- NAMES lrelease -+ NAMES lrelease-qt4 - PATHS ${QT_BINARY_DIR} - NO_DEFAULT_PATH - ) |