aboutsummaryrefslogtreecommitdiffstats
path: root/src/shared/proparser/qmakeglobals.h
diff options
context:
space:
mode:
authorOswald Buddenhagen <[email protected]>2012-06-18 18:16:50 +0200
committerOswald Buddenhagen <[email protected]>2012-07-09 21:17:36 +0200
commit0e6f6e3ca58e5418dc83fc19382855184c8de970 (patch)
tree8df2888ec8249d1c396dddc1030b87978965bfcc /src/shared/proparser/qmakeglobals.h
parentcfb11436bf0e86d1de22b2002d381c6c09dde161 (diff)
make $$QMAKE_QMAKE available to projects
not setting it outside the main project processing, as it's even less likely to be needed there. Change-Id: Ia7afe3a53bf0977d739bf23d7cd79e3a2aee8867 Reviewed-by: Daniel Teske <[email protected]> Reviewed-by: Oswald Buddenhagen <[email protected]>
Diffstat (limited to 'src/shared/proparser/qmakeglobals.h')
-rw-r--r--src/shared/proparser/qmakeglobals.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/shared/proparser/qmakeglobals.h b/src/shared/proparser/qmakeglobals.h
index 11b85bebca0..b21c4289f82 100644
--- a/src/shared/proparser/qmakeglobals.h
+++ b/src/shared/proparser/qmakeglobals.h
@@ -84,13 +84,14 @@ public:
QProcessEnvironment environment;
#endif
QString sysroot;
+ QString qmake_abslocation;
QString user_template, user_template_prefix;
// -nocache, -cache, -spec, QMAKESPEC
// -set persistent value
void setCommandLineArguments(const QStringList &args);
#ifdef PROEVALUATOR_INIT_PROPS
- bool initProperties(const QString &qmake);
+ bool initProperties();
#else
void setProperties(const QHash<QString, QString> &props);
#endif