From c94303fcac16026afcf07aea0400235f09f09f80 Mon Sep 17 00:00:00 2001
From: Clinton Stimpson <clinton@elemtech.com>
Date: Thu, 8 Apr 2010 16:39:15 -0600
Subject: [PATCH] Revert "Include relative path in generated qrc and uic files.
  Fixes #10413."

This reverts commit 108090fde96916ba666f035d1e260f036af5b31e.
---
 Modules/Qt4Macros.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index fc26c06be..bd72c8f64 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -159,7 +159,7 @@ MACRO (QT4_WRAP_UI outfiles )
   FOREACH (it ${ui_files})
     GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
     GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
-    QT4_MAKE_OUTPUT_FILE(${infile} ui_ h outfile)
+    SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
     ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
       COMMAND ${QT_UIC_EXECUTABLE}
       ARGS ${ui_options} -o ${outfile} ${infile}
@@ -179,7 +179,7 @@ MACRO (QT4_ADD_RESOURCES outfiles )
     GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE)
     GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
     GET_FILENAME_COMPONENT(rc_path ${infile} PATH)
-    QT4_MAKE_OUTPUT_FILE(${infile} qrc_ cxx outfile)
+    SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx)
     #  parse file for dependencies 
     #  all files are absolute paths or relative to the location of the qrc file
     FILE(READ "${infile}" _RC_FILE_CONTENTS)