Oswald Buddenhagen
6a54c5e667
stop looking for features outside the mkspecs/ hierarchy
...
follow suit to qmake ...
Change-Id: I8f041adbc3305cddaf7dfd016fc83da228b253e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
2012-07-04 12:48:40 +02:00
Oswald Buddenhagen
e0657a441f
don't look for features in QT_INSTALL_PREFIX
...
follow suit with qmake ...
Change-Id: Ia7ac7e35d45433c2f1c9c5e18ebdb626c13a9abd
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
2012-07-04 12:48:28 +02:00
Oswald Buddenhagen
5a6625245b
introduce ProValueMap typedef for brevity's sake
...
Change-Id: I41b7202acb2889d217d1f437050443bea853ee87
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
2012-07-04 12:48:00 +02:00
Oswald Buddenhagen
55cad4a424
resolve some variables already at parse time
...
they are "compiler defines", with no dependency on the evaluation context.
Change-Id: I25bf006347ecd2edb501a344820e2ac11ff389e9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2012-07-04 12:44:28 +02:00
Oswald Buddenhagen
a0bc0cb990
deprecate $$IN_PWD
...
follow suit with qmake ...
Change-Id: I4154bf80be5c22b145d9795ff26dbf24116c76c2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2012-07-04 12:44:04 +02:00
Oswald Buddenhagen
2f4171459c
give load()/include() with target and infile()/$$fromfile() a clean environment
...
follow suit to qmake ...
Change-Id: If9aa8b14e8b54768faef9151727bdb29fa1ed64b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2012-07-04 12:43:48 +02:00
Oswald Buddenhagen
30928e82e3
don't use a ProFileEvaluator where a QMakeEvaluator is sufficient
...
Change-Id: I6c0becf1a6cd8a323615a481e8fd80ed67358e3b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2012-07-04 12:43:30 +02:00
Oswald Buddenhagen
7257b9682e
remove injection of default_pre in infile()/$$fromfile()
...
follow suit to qmake ...
Change-Id: I6d884e284275e64e13cfea7fdc868341136c81f5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2012-07-04 12:42:58 +02:00
Oswald Buddenhagen
ac297f8e6b
introduce QMakeHandler
...
this is QMakeEvaluatorHandler, but derived from QMakeParserHandler.
the idea is that the parser can be used stand-alone, while the evaluator
needs the parser as well.
we will need it in QMakeGlobals as well, so put it there, as that is the
most central place.
Change-Id: I6ee46c0e4b2e044bf3bfc6e4235b53525ddfc875
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
2012-07-04 12:39:37 +02:00
Oswald Buddenhagen
9c46bd5dec
move expandEnvVars() to QMakeGlobals
...
fits better there
Change-Id: Id369d8e22db97affd03ed991433b898b110f1946
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
2012-07-04 12:35:42 +02:00
Oswald Buddenhagen
4a9b1a7a58
introduce QMakeGlobals::getPathListEnv()
...
variant of getEnv() for fetching paths lists
Change-Id: I2adf26b31354ed97dc3fff12a4c6344b6e9c172f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
2012-07-04 12:35:32 +02:00
Oswald Buddenhagen
5d896112bc
dispose of QMakeGlobals::host_mode
...
follow suit to qmake:
- the spec does not need to set the host mode, especially as some
generators are multi-host capable
- the only thing the host mode affects is the path separator, which can
be done directly instead
Change-Id: I618c2c5051234b105c4bc579240aa9f669b4d958
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2012-07-04 12:35:25 +02:00
Oswald Buddenhagen
87fbe16fd5
add QMakeEvaluator::first()
...
this is a convenience variant of values()
Change-Id: If8e15b46a88c00cef3435b73cf6280ab5f48c062
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
2012-07-04 12:34:46 +02:00
Oswald Buddenhagen
251ed0e878
move LoadFlags to QMakeEvaluator
...
Change-Id: I931bce3aaf1ccaaacf586ca54b93659485b79372
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
2012-07-04 12:24:44 +02:00
Oswald Buddenhagen
b4f38671a2
move remainder of QMakeEvaluator to an own file
...
Change-Id: I09bf3ee41e08062e14a6810d8de036e1c246b0b5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2012-07-04 12:23:31 +02:00
