Oswald Buddenhagen
ed00bd2c85
fix conditionals, in particular the nested else handling
...
this also removes the optimization to skip test function calls which
appear to be part of a failed test, as this could skip includes, etc. as
well.
2009-05-25 18:35:11 +02:00
Oswald Buddenhagen
68b1b828e6
fix m_invertNext effect scoping
...
an evaluation function can be an include statement. the included code
must neither inherit nor change the current inversion state.
2009-05-25 18:35:11 +02:00
Oswald Buddenhagen
51f5ee959f
put condition state variables into a structure
...
to enable cleaner save/restore - for later
2009-05-25 18:35:11 +02:00
Oswald Buddenhagen
cee3ca324e
return value cleanup
...
functions which have essentially two return values are kinda confusing.
so represent file & parse errors as false in the regular evaluation
result (like qmake effectively does).
2009-05-25 18:35:11 +02:00
Oswald Buddenhagen
167a09b206
remove totally pointless conditional
2009-05-25 18:35:11 +02:00
dt
37a9e2bd58
Add a QtVersion::toolChain() method, replacing Qt4Project::toolChain()
...
Makes the code nicer, we use the ProFileReader to parse the mkspec.
2009-05-25 16:43:50 +02:00
Oswald Buddenhagen
d8b1cc5f0e
remove dead code
2009-05-12 10:18:51 +02:00
Oswald Buddenhagen
923db1ce6d
less convoluted
2009-04-16 15:36:26 +02:00
Oswald Buddenhagen
1356d8c20a
whoops
...
newlines are like whitespace, so items don't run together
2009-04-16 15:36:26 +02:00
Oswald Buddenhagen
cc09453cb1
make quote/escape parsing more qmake-compatible
2009-04-15 20:35:58 +02:00
Oswald Buddenhagen
031c7c1658
QT_NO_CAST_FROM_ASCII safety
2009-04-15 20:35:58 +02:00
Oswald Buddenhagen
870a3b3903
protect against circular inclusion of pro/pri files
...
Task-number: 250574
2009-04-15 20:35:58 +02:00
Oswald Buddenhagen
99fccb6d37
do not crash on lines starting with an equal sign
2009-04-15 20:35:58 +02:00
Oswald Buddenhagen
4bece54f34
re-initialize some variables for each file
...
merge 3570e978058816745101a69b552ad9d07e349542 and
00f2031c60bc472544b509586ee31c643ab2e81d from qt.
2009-04-06 11:11:42 +02:00
dt
b3ec859c80
Fixes: Handle debug and release scopes for TARGET and DESTDIR
...
Task: 247606
Details: Remove all the magic which build on top of the cumalative
parser. Instead trust the exact parsing to get those variables correct.
This required a bug fix in the profile evaluator, done with ossi.
Hopefully this doesn't break windows/mac. Will check.
2009-03-19 15:04:43 +01:00
dt
28dacdfdf3
Fixes: Wrong evaluation of arguments to qmake functions
...
Task: 247606
RevBy: analysis and bug fix mostly by ossi
Details: More fixes might be needed.
2009-03-17 17:12:29 +01:00
Oswald Buddenhagen
3670b1a42f
remove qt < 4.5 #ifdefs
2009-03-11 18:40:27 +01:00
Oswald Buddenhagen
027b52a25d
sync variable expansion and list splitting with qmake
2009-03-11 18:40:27 +01:00
Oswald Buddenhagen
5bc97eb1a0
compile without ascii cast (to be in sync with qt)
2009-03-11 18:40:27 +01:00
Oswald Buddenhagen
9f51e3b72c
re-enable $$system() processing
...
unlike the conditional variant, the substituting variant may actually
provide interesting output with rather low likelyhood of side effects.
btw, my FIXME was bogus - i confused the two variants.
2009-03-11 18:40:27 +01:00
Oswald Buddenhagen
a429d7a5e2
blow away the -$VAR hack again, now that things Just Work (TM)
2009-03-11 16:21:00 +01:00
con
7b38d9c8d3
Fixes: - Proparser handling of '=' operator.
...
Details:
"CONFIG = foo bar" resulted in "CONFIG = bar"
"CONFIG = foo
CONFIG = bar $$CONFIG"
resulted in "CONFIG = bar bar"
2009-03-09 15:57:55 +01:00
hjk
8ca887aae2
Fixes: change file license headers to include LGPL
2009-02-25 09:15:00 +01:00
con
d1edc2a2fa
Fixes: - Console application doesn't start on Mac
...
Task: - 244263
RevBy: - dt
2009-02-19 12:42:32 +01:00
dt
fa4bab5075
Fixes: Also do this for objective_sources, probably they need that to.
2009-02-05 12:01:01 +01:00
con
fc8762e6db
Fixes: - Crash in .pro file reader.
...
Details: - Happened in release builds when opening pro files with
CONFIG scopes and a non-valid Qt version set.
2009-02-04 20:43:58 +01:00
hjk
b3c2622fcf
Fixes: potential speed improvement
...
RevBy: dt
Details: create QDir objects ony when needed
2009-02-03 15:09:23 +01:00
hjk
fe0533de2a
Fixes: move all files in shared/* to src/shared/*
2009-01-26 16:19:24 +01:00
