summaryrefslogtreecommitdiffstats
path: root/qmake/project.h
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-02-21 12:44:27 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-02 08:43:21 +0100
commit93ee903da7b10326b40bc43d5f5c659d527e8814 (patch)
treedb887263060408bee2e40efe92075e888ee39dae /qmake/project.h
parent74a6669fa7c0d6e2cb7d34d56332d620d2a07755 (diff)
clean up build pass project initialization
instead of messing with the Option singleton, add a way to inject extra config values into QMakeProject. Change-Id: Ia347dcc38af2c72913e30ebf5c2b4044f93b4f5f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'qmake/project.h')
-rw-r--r--qmake/project.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/qmake/project.h b/qmake/project.h
index ce90be035f..43623a3974 100644
--- a/qmake/project.h
+++ b/qmake/project.h
@@ -84,6 +84,7 @@ class QMakeProject
QString pfile, cfile;
QMakeProperty *prop;
void reset();
+ QStringList extra_configs;
QHash<QString, QStringList> vars, base_vars;
bool parse(const QString &text, QHash<QString, QStringList> &place, int line_count=1);
@@ -118,6 +119,8 @@ public:
QMakeProject(QMakeProperty *p, const QHash<QString, QStringList> &nvars) { init(p, &nvars); }
~QMakeProject();
+ void setExtraConfigs(const QStringList &_cfgs) { extra_configs = _cfgs; }
+
enum { ReadProFile=0x01, ReadSetup=0x02, ReadFeatures=0x04, ReadAll=0xFF };
inline bool parse(const QString &text) { return parse(text, vars); }
bool read(const QString &project, uchar cmd=ReadAll);