diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-05-04 20:02:35 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 14:35:32 +0200 |
| commit | b6b6e85f6b0f75898afc341a8792626ebb9b99ee (patch) | |
| tree | 86eee5e137e4773634c3c37e391c2230ab2002d4 /qmake/project.cpp | |
| parent | 031ac3c167d356e9c853f2c8f4331d5a276c6651 (diff) | |
remove possibility to request project recursion from within a pro file again
the feature was implemented for the abld/sbs2 generators only, and is
of course undocumented.
this reverts most of commit e795e61ef93f8080f9938ac49f2fca306644af85.
Change-Id: Ibd1726b036ce6c45f8e678ea996218f774f8aed2
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 69abfac626..928ecc9bce 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -672,7 +672,6 @@ QMakeProject::init(QMakeProperty *p) prop = p; own_prop = false; } - recursive = false; host_build = false; reset(); } @@ -3225,9 +3224,7 @@ QMakeProject::doProjectTest(QString func, QList<QStringList> args_list, QHash<QS parser.file.toLatin1().constData(), parser.line_no); return false; } - if (args.first() == "recursive") { - recursive = true; - } else if (args.first() == "host_build") { + if (args.first() == "host_build") { if (!host_build && isActiveConfig("cross_compile")) { host_build = true; need_restart = true; |