init_flag = true;
bool hasError = false;
- // It might make sense to bequeath the CONFIG option to the recursed
- // projects. OTOH, one would most likely have it in all projects anyway -
- // either through a qmakespec, a .qmake.cache or explicitly - as otherwise
- // running qmake in a subdirectory would have a different auto-recurse
- // setting than in parent directories.
- bool recurse = Option::recursive == Option::QMAKE_RECURSIVE_YES
- || (Option::recursive == Option::QMAKE_RECURSIVE_DEFAULT
- && project->isRecursive());
+ bool recurse = Option::recursive;
if (recurse && project->isActiveConfig("dont_recurse"))
recurse = false;
if(recurse) {
add_depend = true;
if(dir.right(1) != Option::dir_sep)
dir += Option::dir_sep;
- if(Option::recursive == Option::QMAKE_RECURSIVE_YES) {
+ if (Option::recursive) {
QStringList files = QDir(dir).entryList(QDir::Files);
for(int i = 0; i < (int)files.count(); i++) {
if(files[i] != "." && files[i] != "..")
dir = regex.left(s+1);
regex = regex.right(regex.length() - (s+1));
}
- if(Option::recursive == Option::QMAKE_RECURSIVE_YES) {
+ if (Option::recursive) {
QStringList entries = QDir(dir).entryList(QDir::Dirs);
for(int i = 0; i < (int)entries.count(); i++) {
if(entries[i] != "." && entries[i] != "..") {
subdirs.append(nd);
}
}
- if(Option::recursive == Option::QMAKE_RECURSIVE_YES) {
+ if (Option::recursive) {
QStringList dirs = QDir(newdir).entryList(QDir::Dirs);
for(int i = 0; i < (int)dirs.count(); i++) {
QString nd = fileFixify(newdir + QDir::separator() + dirs[i]);
}
}
}
- if(Option::recursive == Option::QMAKE_RECURSIVE_YES
- && !knownDirs.contains(newdir, Qt::CaseInsensitive))
+ if (Option::recursive && !knownDirs.contains(newdir, Qt::CaseInsensitive))
knownDirs.append(newdir);
}
}
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;
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;
} 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 {
static QString output_dir;
static int debug_level;
static int warn_level;
- enum QMAKE_RECURSIVE { QMAKE_RECURSIVE_DEFAULT, QMAKE_RECURSIVE_YES, QMAKE_RECURSIVE_NO };
- static QMAKE_RECURSIVE recursive;
+ static bool recursive;
static QStringList before_user_vars, after_user_vars;
static QString user_template, user_template_prefix;
prop = p;
own_prop = false;
}
- recursive = false;
host_build = false;
reset();
}
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;
FunctionBlock *function;
QHash<QString, FunctionBlock*> testFunctions, replaceFunctions;
- bool recursive;
bool host_build;
bool need_restart;
bool own_prop;
void dump() const;
- bool isRecursive() const { return recursive; }
bool isHostBuild() const { return host_build; }
protected: