|
Line 0
Link Here
|
|
|
1 |
--- ./Modules/FindQt4.cmake.orig 2008-01-21 19:59:51.000000000 +0100 |
| 2 |
+++ ./Modules/FindQt4.cmake 2008-04-25 21:45:15.000000000 +0200 |
| 3 |
@@ -250,7 +250,7 @@ |
| 4 |
|
| 5 |
GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME) |
| 6 |
# check for qmake |
| 7 |
-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS |
| 8 |
+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 qmake4 qmake PATHS |
| 9 |
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" |
| 10 |
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" |
| 11 |
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin" |
| 12 |
@@ -790,9 +790,9 @@ |
| 13 |
"${QT_UIC_EXECUTABLE_INTERNAL}" QT_UIC_EXECUTABLE_INTERNAL) |
| 14 |
|
| 15 |
SET(QT_MOC_EXECUTABLE |
| 16 |
- ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable") |
| 17 |
+ ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable" FORCE) |
| 18 |
SET(QT_UIC_EXECUTABLE |
| 19 |
- ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable") |
| 20 |
+ ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable" FORCE) |
| 21 |
|
| 22 |
FIND_PROGRAM(QT_UIC3_EXECUTABLE |
| 23 |
NAMES uic3 |