--- a/sbsv2/raptor/RELEASE-NOTES.txt Tue Jan 26 14:49:20 2010 +0000
+++ b/sbsv2/raptor/RELEASE-NOTES.txt Tue Feb 02 10:06:46 2010 +0000
@@ -9,6 +9,10 @@
-c tools2.win32 -c tools2
It only applies to platform tools2 on Linux
+version 2.12.1
+
+- Add a workaround to enable the Qt team to link their code against Symbian DLL's
+
version 2.12.0
New Features:
--- a/sbsv2/raptor/lib/config/locations.xml Tue Jan 26 14:49:20 2010 +0000
+++ b/sbsv2/raptor/lib/config/locations.xml Tue Feb 02 10:06:46 2010 +0000
@@ -73,6 +73,7 @@
<env name='SBS_BVCPP' default="$(SBS_HOME)/$(HOSTPLATFORM_DIR)/bv/bin/cpp.exe" type='tool'/>
<env name='SBS_PERL' default='perl.exe' type='tool'/>
<env name='SBS_PYTHON' default='$(SBS_HOME)/$(HOSTPLATFORM_DIR)/python264/python.exe' type='tool'/>
+ <set name='UNHIDE_CI_REFS' value='$(SBS_HOME)/$(HOSTPLATFORM_DIR)/bin/unhide_ci_refs.exe' type='tool'/>
</var>
<var name="default.locations" extends="hostplatform.locations">
--- a/sbsv2/raptor/lib/config/variants.xml Tue Jan 26 14:49:20 2010 +0000
+++ b/sbsv2/raptor/lib/config/variants.xml Tue Feb 02 10:06:46 2010 +0000
@@ -37,6 +37,9 @@
<var name="techview">
</var>
+ <var name="unhide_ci_refs">
+ <set name='REFERENCES_STV_DEFAULT' value='TRUE'/>
+ </var>
<var name="test">
<set name='TESTCODE' value='TRUE'/>
--- a/sbsv2/raptor/lib/flm/e32abiv2.flm Tue Jan 26 14:49:20 2010 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2.flm Tue Feb 02 10:06:46 2010 +0000
@@ -776,6 +776,7 @@
$(if $(LINKERFEEDBACK_STAGE2),$(FEEDBACK_OPTION)$(call dblquote,$(FEEDBACKFILE))) \
$(if $(MULTIFILE_ENABLED),--multifile $(OUTPUT_OPTION) $(MULTIFILEOBJECT) \
--via $$(call dblquote, $(MULTIFILE_VIAFILE)),$(OUTPUT_OPTION) $$@ $$(call dblquote, $$<)) \
+ $(if $(REFERENCES_STV_DEFAULT),&& $(UNHIDE_CI_REFS) $$@,) \
$(call endrule,compile)
CLEANTARGETS:=$$(CLEANTARGETS) $(DEPENDFILENAME)
@@ -959,6 +960,7 @@
$(if $(USERINCLUDE),$(COMPILER_SYSTEM_INCLUDE_OPTION),)$$(call concat, $(COMPILER_SYSTEM_INCLUDE_OPTION),$$(call dblquote,$(USERINCLUDE))) \
$(if $(SYSTEMINCLUDE),$(COMPILER_SYSTEM_INCLUDE_OPTION),)$$(call concat, $(COMPILER_SYSTEM_INCLUDE_OPTION),$$(call dblquote,$(SYSTEMINCLUDE))) \
$$(call dblquote, $$<) $(OUTPUT_OPTION) $$@ \
+ $(if $(REFERENCES_STV_DEFAULT),&& $(UNHIDE_CI_REFS) $$@,) \
$(call endrule,cia2cpp2o)
--- a/sbsv2/raptor/lib/flm/standard.xml Tue Jan 26 14:49:20 2010 +0000
+++ b/sbsv2/raptor/lib/flm/standard.xml Tue Feb 02 10:06:46 2010 +0000
@@ -75,6 +75,7 @@
<param name='TOOLCHAIN' default=''/>
</interface>
<interface name="Symbian.e32abiv2" extends="Symbian.mmp" flm="e32abiv2.flm">
+ <param name='REFERENCES_STV_DEFAULT' default=''/>
<param name='SUPPORTS_STDCPP_NEWLIB' default='1'/>
<param name='HAS_DEDICATED_OP_NEWDEL_LIB' default='1'/>
<param name='DEFAULT_STDCPP_NEWLIB'/>
@@ -102,6 +103,7 @@
<param name='CPP_LANG_OPTION'/>
<param name='CPPFILT'/>
<param name='CREATEVMAP'/>
+ <param name='UNHIDE_CI_REFS'/>
<param name='CREATEVMAPCPP'/>
<param name='DEBUG_FORMAT'/>
<param name='DEBUG_INFO'/>