summaryrefslogtreecommitdiffstats
path: root/tools/qmake/mkspecs/features
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-03-05 18:02:18 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-07 18:19:31 +0100
commit7e78765a0ced3ee5dd831d47925270037e39feb2 (patch)
tree06789f868a2e9f6061a1f1133fc4bd6143df2c2d /tools/qmake/mkspecs/features
parent3c2af9e9e5fe6f90dfa3d4a58bd30d60e0e211a8 (diff)
Use the shadow build directory for the ninja output
The gyp/ninja build is moved from out/(Debug|Release) to src/core/(Debug|Release). The ninja build as well as generated gyp files and python intermediate files all stay in the source tree for the moment. Change-Id: I6948380c45896540fe508238ceef9fe48e41f5af Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'tools/qmake/mkspecs/features')
-rw-r--r--tools/qmake/mkspecs/features/functions.prf5
1 files changed, 0 insertions, 5 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index 46d43be96..0814e8b4f 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -8,11 +8,6 @@ defineReplace(toGypTargetType) {
return("none")
}
-defineReplace(getOutDir) {
- # FIXME: rely on env variable in here and in the gyp_qtwebengine script, à la WEBKITOUTPUTDIR
- return("$$QTWEBENGINE_ROOT/out")
-}
-
defineReplace(getConfigDir) {
CONFIG(release, debug|release):return("Release")
return("Debug")