From 25eeb3c47c400d274110fe5a2216fb157166d778 Mon Sep 17 00:00:00 2001
From: Clinton Stimpson <clinton@elemtech.com>
Date: Tue, 25 Nov 2008 16:56:44 -0500
Subject: [PATCH] BUG:  Revert 1.138.

---
 Modules/FindQt4.cmake | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 10b8a037d..fbfe80a4b 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -752,9 +752,30 @@ IF (QT4_QMAKE_FOUND)
   #######################################
 
 
+  # find moc and uic using qmake
+  QT_QUERY_QMAKE(QT_MOC_EXECUTABLE_INTERNAL "QMAKE_MOC")
+  QT_QUERY_QMAKE(QT_UIC_EXECUTABLE_INTERNAL "QMAKE_UIC")
+
+  # make sure we have / and not \ as qmake gives on windows
+  FILE(TO_CMAKE_PATH 
+    "${QT_MOC_EXECUTABLE_INTERNAL}" QT_MOC_EXECUTABLE_INTERNAL)
+  # make sure we have / and not \ as qmake gives on windows
+  FILE(TO_CMAKE_PATH 
+    "${QT_UIC_EXECUTABLE_INTERNAL}" QT_UIC_EXECUTABLE_INTERNAL)
+
+  IF(QT_QMAKE_CHANGED)
+    SET(QT_MOC_EXECUTABLE 
+      ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable" FORCE)
+    SET(QT_UIC_EXECUTABLE 
+      ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable" FORCE)
+  ELSE(QT_QMAKE_CHANGED)
+    SET(QT_MOC_EXECUTABLE 
+      ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable")
+    SET(QT_UIC_EXECUTABLE 
+      ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable")
+  ENDIF(QT_QMAKE_CHANGED)
+
   IF(QT_QMAKE_CHANGED)
-    SET(QT_MOC_EXECUTABLE NOTFOUND)
-    SET(QT_UIC_EXECUTABLE NOTFOUND)
     SET(QT_UIC3_EXECUTABLE NOTFOUND)
     SET(QT_RCC_EXECUTABLE NOTFOUND)
     SET(QT_DBUSCPP2XML_EXECUTABLE NOTFOUND)
@@ -762,18 +783,6 @@ IF (QT4_QMAKE_FOUND)
     SET(QT_LUPDATE_EXECUTABLE NOTFOUND)
     SET(QT_LRELEASE_EXECUTABLE NOTFOUND)
   ENDIF(QT_QMAKE_CHANGED)
-  
-  FIND_PROGRAM(QT_MOC_EXECUTABLE
-    NAMES moc
-    PATHS ${QT_BINARY_DIR}
-    NO_DEFAULT_PATH
-    )
-  
-  FIND_PROGRAM(QT_UIC_EXECUTABLE
-    NAMES uic
-    PATHS ${QT_BINARY_DIR}
-    NO_DEFAULT_PATH
-    )
 
   FIND_PROGRAM(QT_UIC3_EXECUTABLE
     NAMES uic3