purge QT_(SOURCE|BUILD)_TREE usage

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

diff --git a/src/qtestlib/wince/cetest/bootstrapped.pri b/src/qtestlib/wince/cetest/bootstrapped.pri
index 7614106..9affc05 100644 (file)
--- a/src/qtestlib/wince/cetest/bootstrapped.pri
+++ b/src/qtestlib/wince/cetest/bootstrapped.pri
@@ -1,47 +1,47 @@
 # Bootstrapped Input
 SOURCES += \
-           $$QT_SOURCE_TREE/src/corelib/tools/qstring.cpp \
-           $$QT_SOURCE_TREE/src/corelib/tools/qstringlist.cpp \
-           $$QT_SOURCE_TREE/src/corelib/io/qfile.cpp \
-           $$QT_SOURCE_TREE/src/corelib/io/qdir.cpp \
-           $$QT_SOURCE_TREE/src/corelib/io/qfilesystementry.cpp \
-           $$QT_SOURCE_TREE/src/corelib/io/qfilesystemengine.cpp \
-           $$QT_SOURCE_TREE/src/corelib/io/qfilesystemengine_win.cpp \
-           $$QT_SOURCE_TREE/src/corelib/io/qfilesystemiterator_win.cpp \
-           $$QT_SOURCE_TREE/src/corelib/io/qfsfileengine.cpp \
-           $$QT_SOURCE_TREE/src/corelib/io/qabstractfileengine.cpp \
-           $$QT_SOURCE_TREE/src/corelib/io/qfsfileengine_win.cpp \
-           $$QT_SOURCE_TREE/src/corelib/io/qfsfileengine_iterator.cpp \
-           $$QT_SOURCE_TREE/src/corelib/io/qfileinfo.cpp \
-           $$QT_SOURCE_TREE/src/corelib/io/qtemporaryfile.cpp \
-           $$QT_SOURCE_TREE/src/corelib/io/qdiriterator.cpp \
-           $$QT_SOURCE_TREE/src/corelib/io/qiodevice.cpp \
-           $$QT_SOURCE_TREE/src/corelib/io/qbuffer.cpp \
-           $$QT_SOURCE_TREE/src/corelib/io/qtextstream.cpp \
-           $$QT_SOURCE_TREE/src/corelib/io/qurl.cpp \
-           $$QT_SOURCE_TREE/src/corelib/io/qsettings.cpp \     
-           $$QT_SOURCE_TREE/src/corelib/io/qsettings_win.cpp \
-           $$QT_SOURCE_TREE/src/corelib/tools/qdatetime.cpp \
-           $$QT_SOURCE_TREE/src/corelib/tools/qlocale.cpp \
-           $$QT_SOURCE_TREE/src/corelib/tools/qbytearray.cpp \
-           $$QT_SOURCE_TREE/src/corelib/tools/qbytearraymatcher.cpp \
-           $$QT_SOURCE_TREE/src/corelib/tools/qvector.cpp \
-           $$QT_SOURCE_TREE/src/corelib/tools/qvsnprintf.cpp \
-           $$QT_SOURCE_TREE/src/corelib/tools/qlist.cpp \
-           $$QT_SOURCE_TREE/src/corelib/tools/qhash.cpp \
-           $$QT_SOURCE_TREE/src/corelib/tools/qlocale_tools.cpp \
-           $$QT_SOURCE_TREE/src/corelib/global/qglobal.cpp \
-           $$QT_BUILD_TREE/src/corelib/global/qconfig.cpp \
-           $$QT_SOURCE_TREE/src/corelib/global/qmalloc.cpp \
-           $$QT_SOURCE_TREE/src/corelib/global/qnumeric.cpp \
-           $$QT_SOURCE_TREE/src/corelib/global/qlibraryinfo.cpp \
-           $$QT_SOURCE_TREE/src/corelib/tools/qregexp.cpp \
-           $$QT_SOURCE_TREE/src/corelib/tools/qmap.cpp \
-           $$QT_SOURCE_TREE/src/corelib/tools/qbitarray.cpp \
-           $$QT_SOURCE_TREE/src/corelib/kernel/qmetatype.cpp \
-           $$QT_SOURCE_TREE/src/corelib/kernel/qvariant.cpp \
-           $$QT_SOURCE_TREE/src/corelib/kernel/qsystemerror.cpp \
-           $$QT_SOURCE_TREE/src/corelib/plugin/qsystemlibrary.cpp \
-           $$QT_SOURCE_TREE/src/corelib/codecs/qutfcodec.cpp \
-           $$QT_SOURCE_TREE/src/corelib/xml/qxmlstream.cpp \
-           $$QT_SOURCE_TREE/src/corelib/xml/qxmlutils.cpp
+           $$QT.core.sources/tools/qstring.cpp \
+           $$QT.core.sources/tools/qstringlist.cpp \
+           $$QT.core.sources/io/qfile.cpp \
+           $$QT.core.sources/io/qdir.cpp \
+           $$QT.core.sources/io/qfilesystementry.cpp \
+           $$QT.core.sources/io/qfilesystemengine.cpp \
+           $$QT.core.sources/io/qfilesystemengine_win.cpp \
+           $$QT.core.sources/io/qfilesystemiterator_win.cpp \
+           $$QT.core.sources/io/qfsfileengine.cpp \
+           $$QT.core.sources/io/qabstractfileengine.cpp \
+           $$QT.core.sources/io/qfsfileengine_win.cpp \
+           $$QT.core.sources/io/qfsfileengine_iterator.cpp \
+           $$QT.core.sources/io/qfileinfo.cpp \
+           $$QT.core.sources/io/qtemporaryfile.cpp \
+           $$QT.core.sources/io/qdiriterator.cpp \
+           $$QT.core.sources/io/qiodevice.cpp \
+           $$QT.core.sources/io/qbuffer.cpp \
+           $$QT.core.sources/io/qtextstream.cpp \
+           $$QT.core.sources/io/qurl.cpp \
+           $$QT.core.sources/io/qsettings.cpp \
+           $$QT.core.sources/io/qsettings_win.cpp \
+           $$QT.core.sources/tools/qdatetime.cpp \
+           $$QT.core.sources/tools/qlocale.cpp \
+           $$QT.core.sources/tools/qbytearray.cpp \
+           $$QT.core.sources/tools/qbytearraymatcher.cpp \
+           $$QT.core.sources/tools/qvector.cpp \
+           $$QT.core.sources/tools/qvsnprintf.cpp \
+           $$QT.core.sources/tools/qlist.cpp \
+           $$QT.core.sources/tools/qhash.cpp \
+           $$QT.core.sources/tools/qlocale_tools.cpp \
+           $$QT.core.sources/global/qglobal.cpp \
+           $$shadowed($$QT.core.sources)/global/qconfig.cpp \
+           $$QT.core.sources/global/qmalloc.cpp \
+           $$QT.core.sources/global/qnumeric.cpp \
+           $$QT.core.sources/global/qlibraryinfo.cpp \
+           $$QT.core.sources/tools/qregexp.cpp \
+           $$QT.core.sources/tools/qmap.cpp \
+           $$QT.core.sources/tools/qbitarray.cpp \
+           $$QT.core.sources/kernel/qmetatype.cpp \
+           $$QT.core.sources/kernel/qvariant.cpp \
+           $$QT.core.sources/kernel/qsystemerror.cpp \
+           $$QT.core.sources/plugin/qsystemlibrary.cpp \
+           $$QT.core.sources/codecs/qutfcodec.cpp \
+           $$QT.core.sources/xml/qxmlstream.cpp \
+           $$QT.core.sources/xml/qxmlutils.cpp

diff --git a/src/qtestlib/wince/cetest/cetest.pro b/src/qtestlib/wince/cetest/cetest.pro
index bfb9c70..543ca9b 100644 (file)
--- a/src/qtestlib/wince/cetest/cetest.pro
+++ b/src/qtestlib/wince/cetest/cetest.pro
@@ -16,16 +16,13 @@ DEFINES        += QT_BUILD_QMAKE QT_BOOTSTRAPPED QT_NO_CODECS QT_LITE_UNICODE QT
                   QT_NODLL QT_NO_QOBJECT
 
 INCLUDEPATH = \
-              $$QT_SOURCE_TREE/tools/qtestlib/ce/cetest \
-              $$QT_SOURCE_TREE/qmake \
-              $$QT_SOURCE_TREE/qmake/generators/symbian \
-                         $$QT_SOURCE_TREE/tools/shared \
-              $$QT_BUILD_TREE/include \
-              $$QT_BUILD_TREE/include/QtCore \
-              $$QT_BUILD_TREE/src/corelib/global
-                         
-VPATH += $$QT_SOURCE_TREE/tools/shared
+              $$QT.core.sources/../../tools/qtestlib/ce/cetest \
+              $$QT.core.sources/../../qmake \
+              $$QT.core.sources/../../qmake/generators/symbian \
+              $$QT.core.sources/../../tools/shared \
+              $$QT.core.includes
 
+VPATH += $$QT.core.sources/../../tools/shared
 
 HEADERS += \
         remoteconnection.h \

diff --git a/src/qtestlib/wince/cetest/qmake_include.pri b/src/qtestlib/wince/cetest/qmake_include.pri
index 35fbc64..5005289 100644 (file)
--- a/src/qtestlib/wince/cetest/qmake_include.pri
+++ b/src/qtestlib/wince/cetest/qmake_include.pri
@@ -1,13 +1,13 @@
 #qmake source files needed for cetest
 HEADERS += \
-           $$QT_SOURCE_TREE/qmake/option.h
+           $$QT.core.sources/../../qmake/option.h
 SOURCES += \
-           $$QT_SOURCE_TREE/qmake/option.cpp \
-           $$QT_SOURCE_TREE/qmake/project.cpp \
-           $$QT_SOURCE_TREE/qmake/property.cpp \
-           $$QT_SOURCE_TREE/qmake/generators/metamakefile.cpp \
-           $$QT_SOURCE_TREE/qmake/generators/symbian/initprojectdeploy_symbian.cpp \
-           $$QT_SOURCE_TREE/tools/shared/symbian/epocroot.cpp \
-           $$QT_SOURCE_TREE/tools/shared/windows/registry.cpp
+           $$QT.core.sources/../../qmake/option.cpp \
+           $$QT.core.sources/../../qmake/project.cpp \
+           $$QT.core.sources/../../qmake/property.cpp \
+           $$QT.core.sources/../../qmake/generators/metamakefile.cpp \
+           $$QT.core.sources/../../qmake/generators/symbian/initprojectdeploy_symbian.cpp \
+           $$QT.core.sources/../../tools/shared/symbian/epocroot.cpp \
+           $$QT.core.sources/../../tools/shared/windows/registry.cpp
 
 DEFINES += QT_QMAKE_PARSER_ONLY