diff -r 3b1da2848fc7 -r d3bac044e0f0 src/plugins/s60/s60pluginbase.pri --- a/src/plugins/s60/s60pluginbase.pri Fri Feb 19 23:40:16 2010 +0200 +++ b/src/plugins/s60/s60pluginbase.pri Fri Mar 12 15:46:37 2010 +0200 @@ -6,11 +6,12 @@ MMP_RULES += NOEXPORTLIBRARY -defBlock = \ +# :QTP:QTPROD-479:defBlock name clashes with def_block.prf +pluginDefBlock = \ "$${LITERAL_HASH}ifdef WINSCW" \ "DEFFILE ../bwins/qts60plugin.def" \ "$${LITERAL_HASH}else" \ "DEFFILE ../eabi/qts60plugin.def" \ "$${LITERAL_HASH}endif" -MMP_RULES += defBlock \ No newline at end of file +MMP_RULES += pluginDefBlock \ No newline at end of file