diff options
author | Rafael Roquetto <rafael.roquetto@kdab.com> | 2012-08-03 19:35:54 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-06 16:04:03 +0200 |
commit | 6f580d6a5ae9cb553aa8486499af35a46406c4c6 (patch) | |
tree | 06586aae781e46b6f59a7ac484dd7ce0958e0aea /qmake/project.cpp | |
parent | 1db721e51aa57a9e21040cce1623c9222c5156f8 (diff) |
Fix qmake -project
qmake -project was always outputting a project with subdirs template, because
Option::h_moc_mod was not being properly read, causing addFile() to misbehave.
Change-Id: I2c07aea132f9885eabf188de993b0fabfb352886
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'qmake/project.cpp')
-rw-r--r-- | qmake/project.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 61140e9acb..3379f452a3 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1518,6 +1518,12 @@ QMakeProject::read(uchar cmd) vars = base_vars; // start with the base } setupProject(); + } else if (cmd & ReadFeatures) { + // Even when ReadSetup is not set, but ReadFeatures is, + // we still need to process spec_pre.prf to load some + // default values and other settings. + debug_msg(1, "Processing spec_pre (but skipping actual spec): %s", vars["CONFIG"].join("::").toLatin1().constData()); + doProjectInclude("spec_pre", IncludeFlagFeature, vars); } for (QHash<QString, QStringList>::ConstIterator it = extra_vars.constBegin(); |