# HG changeset patch
# User Richard Taylor <richard.i.taylor@nokia.com>
# Date 1267538312 0
# Node ID 927c16c07c8858e4bfbce0bc54772e95557a6ad4
# Parent  f0e42ff3359fdc9a0c3e0e71835e74526e09474c
remove unhide_ci_refs workaround (compiler fixed)

diff -r f0e42ff3359f -r 927c16c07c88 sbsv2/raptor/RELEASE-NOTES.txt
--- a/sbsv2/raptor/RELEASE-NOTES.txt	Tue Mar 02 13:34:36 2010 +0000
+++ b/sbsv2/raptor/RELEASE-NOTES.txt	Tue Mar 02 13:58:32 2010 +0000
@@ -6,7 +6,6 @@
 - Add support for Cygwin 1.7.
 - New support for cross-compiling win32 tools on Linux.  
   To enable it, use "sbs -c tools2.win32 -c tools2" on Linux
-- New workaround to enable the Qt team to link their code against Symbian DLL's
 - New prototype support for reading System Definition v3 files
 
 
diff -r f0e42ff3359f -r 927c16c07c88 sbsv2/raptor/lib/config/locations.xml
--- a/sbsv2/raptor/lib/config/locations.xml	Tue Mar 02 13:34:36 2010 +0000
+++ b/sbsv2/raptor/lib/config/locations.xml	Tue Mar 02 13:58:32 2010 +0000
@@ -102,7 +102,6 @@
 		<set name='UNZIP' value="$(SBS_UNZIP)" type='tool'/>
 		<set name='PERL' value='$(SBS_PERL)' type='tool'/>
 		<set name='PYTHON' value='$(SBS_PYTHON)' type='tool' versionCommand='$(PYTHON) -V' versionResult='Python 2\.[456].*'/>
-		<set name='UNHIDE_CI_REFS' value='$(SBS_HOME)/$(HOSTPLATFORM_DIR)/bin/unhide_ci_refs.exe' type='tool'/>
 		
 		<set name='DEFAULT_PLATFORMS' value='ARMV5 ARMV7 WINSCW'/>
 		<set name='BASE_DEFAULT_PLATFORMS' value='ARMV5 ARMV7 WINSCW ARMV5SMP'/>
diff -r f0e42ff3359f -r 927c16c07c88 sbsv2/raptor/lib/config/variants.xml
--- a/sbsv2/raptor/lib/config/variants.xml	Tue Mar 02 13:34:36 2010 +0000
+++ b/sbsv2/raptor/lib/config/variants.xml	Tue Mar 02 13:58:32 2010 +0000
@@ -38,9 +38,6 @@
 
 	<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'/>
diff -r f0e42ff3359f -r 927c16c07c88 sbsv2/raptor/lib/flm/e32abiv2.flm
--- a/sbsv2/raptor/lib/flm/e32abiv2.flm	Tue Mar 02 13:34:36 2010 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2.flm	Tue Mar 02 13:58:32 2010 +0000
@@ -777,7 +777,6 @@
 			$(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)
 
 ifeq ($(NO_DEPEND_GENERATE),)
@@ -967,7 +966,6 @@
 	 		$(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)
 
 
diff -r f0e42ff3359f -r 927c16c07c88 sbsv2/raptor/lib/flm/standard.xml
--- a/sbsv2/raptor/lib/flm/standard.xml	Tue Mar 02 13:34:36 2010 +0000
+++ b/sbsv2/raptor/lib/flm/standard.xml	Tue Mar 02 13:58:32 2010 +0000
@@ -75,7 +75,6 @@
 		<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'/>
@@ -103,7 +102,6 @@
 		<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'/>