summaryrefslogtreecommitdiffstats
path: root/qmake/option.h
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-02-23 19:34:10 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-02 08:43:06 +0100
commit74a6669fa7c0d6e2cb7d34d56332d620d2a07755 (patch)
tree9dccf49e81b2a212822304c50b3a7976580da816 /qmake/option.h
parent123eb803ef1a7af36eefdf9a668f1f29d6597f1d (diff)
move finding the makespec to Option
this is a one-time operation which depends only on the invocation, so this new home is much more appropriate. Change-Id: I07c66d95a9ae01a664cec17564995311fb78ec9b Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'qmake/option.h')
-rw-r--r--qmake/option.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/option.h b/qmake/option.h
index a4d8cccbec..96549bb5bc 100644
--- a/qmake/option.h
+++ b/qmake/option.h
@@ -108,6 +108,7 @@ struct Option
//both of these must be called..
static int init(int argc=0, char **argv=0); //parse cmdline
static void applyHostMode();
+ static QStringList mkspecPaths();
static bool prepareProject(const QString &pfile);
static bool postProcessProject(QMakeProject *);
@@ -212,6 +213,7 @@ struct Option
private:
static int parseCommandLine(int, char **, int=0);
+ static bool resolveSpec(QString *spec);
};
inline QString fixEnvVariables(const QString &x) { return Option::fixString(x, Option::FixEnvVars); }