From b6b6e85f6b0f75898afc341a8792626ebb9b99ee Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 4 May 2012 20:02:35 +0200 Subject: 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 --- qmake/option.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'qmake/option.cpp') diff --git a/qmake/option.cpp b/qmake/option.cpp index 520b89be28..b2f5de50b5 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -83,7 +83,7 @@ int Option::warn_level = WarnLogic | WarnDeprecated; int Option::debug_level = 0; QFile Option::output; QString Option::output_dir; -Option::QMAKE_RECURSIVE Option::recursive = Option::QMAKE_RECURSIVE_DEFAULT; +bool Option::recursive = false; QStringList Option::before_user_vars; QStringList Option::after_user_vars; QString Option::user_template; @@ -225,7 +225,7 @@ Option::parseCommandLine(int argc, char **argv, int skip) if(x == 1) { bool specified = true; if(opt == "project") { - Option::recursive = Option::QMAKE_RECURSIVE_YES; + Option::recursive = true; Option::qmake_mode = Option::QMAKE_GENERATE_PROJECT; } else if(opt == "prl") { Option::mkfile::do_deps = false; @@ -283,9 +283,9 @@ Option::parseCommandLine(int argc, char **argv, int skip) } else if(opt == "Wnone") { Option::warn_level = WarnNone; } else if(opt == "r" || opt == "recursive") { - Option::recursive = Option::QMAKE_RECURSIVE_YES; + Option::recursive = true; } else if(opt == "nr" || opt == "norecursive") { - Option::recursive = Option::QMAKE_RECURSIVE_NO; + Option::recursive = false; } else if(opt == "config") { user_configs += argv[++x]; } else { -- cgit v1.2.3