From deea66c9f43c0a71d1f6387d7d4d59edeae79648 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 2 Mar 2012 21:32:02 +0100
Subject: remove obviously counterproductive uses of QT_SOURCE_TREE &
 QT_BUILD_TREE

Change-Id: I77cf734b58f350d82277c084a680ab56fdf82f08
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---
 src/src.pro         | 28 ++++++++++++++--------------
 src/tools/tools.pro |  8 ++++----
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/src.pro b/src/src.pro
index 941064eb59..21916b31f4 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -16,35 +16,35 @@ contains(QT_CONFIG, no-gui): SRC_SUBDIRS -= src_gui
 contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl
 SRC_SUBDIRS += src_plugins
 
-src_winmain.subdir = $$QT_SOURCE_TREE/src/winmain
+src_winmain.subdir = $$PWD/winmain
 src_winmain.target = sub-winmain
-src_corelib.subdir = $$QT_SOURCE_TREE/src/corelib
+src_corelib.subdir = $$PWD/corelib
 src_corelib.target = sub-corelib
-src_xml.subdir = $$QT_SOURCE_TREE/src/xml
+src_xml.subdir = $$PWD/xml
 src_xml.target = sub-xml
-src_dbus.subdir = $$QT_SOURCE_TREE/src/dbus
+src_dbus.subdir = $$PWD/dbus
 src_dbus.target = sub-dbus
-src_gui.subdir = $$QT_SOURCE_TREE/src/gui
+src_gui.subdir = $$PWD/gui
 src_gui.target = sub-gui
-src_sql.subdir = $$QT_SOURCE_TREE/src/sql
+src_sql.subdir = $$PWD/sql
 src_sql.target = sub-sql
-src_network.subdir = $$QT_SOURCE_TREE/src/network
+src_network.subdir = $$PWD/network
 src_network.target = sub-network
-src_opengl.subdir = $$QT_SOURCE_TREE/src/opengl
+src_opengl.subdir = $$PWD/opengl
 src_opengl.target = sub-opengl
-src_plugins.subdir = $$QT_SOURCE_TREE/src/plugins
+src_plugins.subdir = $$PWD/plugins
 src_plugins.target = sub-plugins
-src_widgets.subdir = $$QT_SOURCE_TREE/src/widgets
+src_widgets.subdir = $$PWD/widgets
 src_widgets.target = sub-widgets
 !wince*: {
-    src_printsupport.subdir = $$QT_SOURCE_TREE/src/printsupport
+    src_printsupport.subdir = $$PWD/printsupport
     src_printsupport.target = sub-printsupport
 }
-src_testlib.subdir = $$QT_SOURCE_TREE/src/testlib
+src_testlib.subdir = $$PWD/testlib
 src_testlib.target = sub-testlib
-src_platformsupport.subdir = $$QT_SOURCE_TREE/src/platformsupport
+src_platformsupport.subdir = $$PWD/platformsupport
 src_platformsupport.target = sub-platformsupport
-src_concurrent.subdir = $$QT_SOURCE_TREE/src/concurrent
+src_concurrent.subdir = $$PWD/concurrent
 src_concurrent.target = sub-concurrent
 
 
diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index 1d12423744..8c2739a381 100644
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -3,13 +3,13 @@ TEMPLATE = subdirs
 TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc
 !contains(QT_CONFIG, no-gui): TOOLS_SUBDIRS += src_tools_uic
 # Set subdir and respective target name
-src_tools_bootstrap.subdir = $$QT_SOURCE_TREE/src/tools/bootstrap
+src_tools_bootstrap.subdir = $$PWD/bootstrap
 src_tools_bootstrap.target = sub-tools-bootstrap
-src_tools_moc.subdir = $$QT_SOURCE_TREE/src/tools/moc
+src_tools_moc.subdir = $$PWD/moc
 src_tools_moc.target = sub-moc
-src_tools_rcc.subdir = $$QT_SOURCE_TREE/src/tools/rcc
+src_tools_rcc.subdir = $$PWD/rcc
 src_tools_rcc.target = sub-rcc
-src_tools_uic.subdir = $$QT_SOURCE_TREE/src/tools/uic
+src_tools_uic.subdir = $$PWD/uic
 src_tools_uic.target = sub-uic
 src_tools_qdoc.subdir = $$QT_SOURCE_TREE/src/tools/qdoc
 src_tools_qdoc.target = sub-qdoc
-- 
cgit v1.2.3