equal
deleted
inserted
replaced
31 <antcall target="run-qmake" inheritAll="false" inheritRefs="true"> |
31 <antcall target="run-qmake" inheritAll="false" inheritRefs="true"> |
32 <param name="qmake.enabled" value="true"/> |
32 <param name="qmake.enabled" value="true"/> |
33 <param name="sysdef.configuration" value="${sysdef.configurations.list}"/> |
33 <param name="sysdef.configuration" value="${sysdef.configurations.list}"/> |
34 </antcall> |
34 </antcall> |
35 |
35 |
36 |
|
37 <!-- perform initial exports --> |
36 <!-- perform initial exports --> |
38 <antcall target="sf-do-full-export" inheritAll="false" inheritRefs="true"> |
37 <antcall target="sf-do-full-export" inheritAll="false" inheritRefs="true"> |
39 <param name="sf.export.stage.name" value="full_export"/> |
38 <param name="sf.export.stage.name" value="full_export"/> |
40 </antcall> |
39 </antcall> |
|
40 |
|
41 <!-- explicitly run qmake second time to allow -configure options to be applied --> |
|
42 <antcall target="run-qmake" inheritAll="false" inheritRefs="true"> |
|
43 <param name="qmake.enabled" value="true"/> |
|
44 <param name="sysdef.configuration" value="${sysdef.configurations.list}"/> |
|
45 </antcall> |
41 |
46 |
42 <if> <!-- If tools baseline unpack has not been specified, or its not a "fast" build then try to build them --> |
47 <if> <!-- If tools baseline unpack has not been specified, or its not a "fast" build then try to build them --> |
43 <or> |
48 <or> |
44 <isfalse value="${sf.unpack.tools}"/> |
49 <isfalse value="${sf.unpack.tools}"/> |
45 <isfalse value="${sf.spec.baseline.enable}"/> |
50 <isfalse value="${sf.spec.baseline.enable}"/> |