remove obviously counterproductive uses of QT_SOURCE_TREE & QT_BUILD_TREE

Change-Id: I77cf734b58f350d82277c084a680ab56fdf82f08
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

diff --git a/qtbase.pro b/qtbase.pro
index 9290d5a..7648a63 100644 (file)
--- a/qtbase.pro
+++ b/qtbase.pro
@@ -96,36 +96,36 @@ CONFIG -= qt
 #qmake
 qmake.path = $$[QT_HOST_BINS]
 win32 {
-   qmake.files=$$QT_BUILD_TREE/bin/qmake.exe
+   qmake.files = $$OUT_PWD/bin/qmake.exe
 } else {
-   qmake.files=$$QT_BUILD_TREE/bin/qmake
+   qmake.files = $$OUT_PWD/bin/qmake
 }
 INSTALLS += qmake
 
 #syncqt
 syncqt.path = $$[QT_HOST_BINS]
-syncqt.files=$$QT_BUILD_TREE/bin/syncqt
-win32:syncqt.files=$$QT_BUILD_TREE/bin/syncqt.bat
+syncqt.files = $$OUT_PWD/bin/syncqt
+win32:syncqt.files = $$OUT_PWD/bin/syncqt.bat
 INSTALLS += syncqt
 
 #qtmodule-configtests
 configtests.path = $$[QT_HOST_BINS]
-configtests.files=$$QT_BUILD_TREE/bin/qtmodule-configtests
+configtests.files = $$PWD/bin/qtmodule-configtests
 INSTALLS += configtests
 
 #mkspecs
 mkspecs.path = $$[QT_HOST_DATA]/mkspecs
-mkspecs.files=$$QT_BUILD_TREE/mkspecs/qconfig.pri $$QT_BUILD_TREE/mkspecs/qmodule.pri $$files($$QT_SOURCE_TREE/mkspecs/*)
-mkspecs.files -= $$QT_SOURCE_TREE/mkspecs/modules
+mkspecs.files = $$OUT_PWD/mkspecs/qconfig.pri $$OUT_PWD/mkspecs/qmodule.pri $$files($$PWD/mkspecs/*)
+mkspecs.files -= $$PWD/mkspecs/modules
 unix { 
    DEFAULT_QMAKESPEC = $$QMAKESPEC
    DEFAULT_QMAKESPEC ~= s,^.*mkspecs/,,g
    mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/default; $(SYMLINK) $$DEFAULT_QMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default
-   mkspecs.files -= $$QT_SOURCE_TREE/mkspecs/default
+   mkspecs.files -= $$PWD/mkspecs/default
 }
-win32:!equals(QT_BUILD_TREE, $$QT_SOURCE_TREE) {
+win32:!equals(OUT_PWD, $$PWD) {
     # When shadow building on Windows, the default mkspec only exists in the build tree.
-    mkspecs.files += $$QT_BUILD_TREE/mkspecs/default
+    mkspecs.files += $$OUT_PWD/mkspecs/default
 }
 INSTALLS += mkspecs
 

diff --git a/src/src.pro b/src/src.pro
index 941064e..21916b3 100644 (file)
--- 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 1d12423..8c2739a 100644 (file)
--- 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