# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1279882391 -3600
# Node ID 89726274e03ca0ca7f42c8316e4569aac0a5af26
# Parent  442486f870da77422101cb14eb2084f178b2df0c
More GCCE problems: wrong choice of DEF file in .pro files - add to bug 2999

diff -r 442486f870da -r 89726274e03c commondrm/drmbrowserlauncher/drmbrowserlauncher.pro
--- a/commondrm/drmbrowserlauncher/drmbrowserlauncher.pro	Thu Jul 22 16:35:50 2010 +0100
+++ b/commondrm/drmbrowserlauncher/drmbrowserlauncher.pro	Fri Jul 23 11:53:11 2010 +0100
@@ -28,7 +28,7 @@
 TARGET.EPOCALLOWDLLDATA = 1
 
 defBlock = \
-	"$${LITERAL_HASH}if defined(ARMCC)" \
+	"$${LITERAL_HASH}if defined(EABI)" \
 	"DEFFILE ./eabi/" \
 	"$${LITERAL_HASH}elif defined( WINSCW )" \
 	"DEFFILE ./bwinscw/" \
diff -r 442486f870da -r 89726274e03c commondrm/drmutility/group/qt/drmuihandlingimpl.pro
--- a/commondrm/drmutility/group/qt/drmuihandlingimpl.pro	Thu Jul 22 16:35:50 2010 +0100
+++ b/commondrm/drmutility/group/qt/drmuihandlingimpl.pro	Fri Jul 23 11:53:11 2010 +0100
@@ -80,7 +80,7 @@
 	MMP_RULES += IfdefLibBlock
 
 	defBlock = \
-	"$${LITERAL_HASH}if defined(ARMCC)" \
+	"$${LITERAL_HASH}if defined(EABI)" \
 	"DEFFILE ../../eabi/" \
 	"$${LITERAL_HASH}elif defined( WINSCW )" \
 	"DEFFILE ../../bwinscw/" \
diff -r 442486f870da -r 89726274e03c commondrm/drmutility/group/qt/drmutilitydmgrwrapper.pro
--- a/commondrm/drmutility/group/qt/drmutilitydmgrwrapper.pro	Thu Jul 22 16:35:50 2010 +0100
+++ b/commondrm/drmutility/group/qt/drmutilitydmgrwrapper.pro	Fri Jul 23 11:53:11 2010 +0100
@@ -65,7 +65,7 @@
 	MMP_RULES += ResourceBlock
 
 	defBlock = \
-	"$${LITERAL_HASH}if defined(ARMCC)" \
+	"$${LITERAL_HASH}if defined(EABI)" \
 	"DEFFILE ../../eabi/" \
 	"$${LITERAL_HASH}elif defined( WINSCW )" \
 	"DEFFILE ../../bwinscw/" \
diff -r 442486f870da -r 89726274e03c omadrm/drmhelper/group/drmhelper.pro
--- a/omadrm/drmhelper/group/drmhelper.pro	Thu Jul 22 16:35:50 2010 +0100
+++ b/omadrm/drmhelper/group/drmhelper.pro	Fri Jul 23 11:53:11 2010 +0100
@@ -113,7 +113,7 @@
 	MMP_RULES += ResourceBlock
 
 	defBlock = \
-	"$${LITERAL_HASH}if defined(ARMCC)" \
+	"$${LITERAL_HASH}if defined(EABI)" \
 	"DEFFILE ../eabi/" \
 	"$${LITERAL_HASH}elif defined( WINSCW )" \
 	"DEFFILE ../bwinscw/" \