Further bug fixes for enable/disables DEF files mechanism on Symbian
authorIain <qt-info@nokia.com>
Thu, 4 Feb 2010 10:29:34 +0000 (10:29 +0000)
committerIain <qt-info@nokia.com>
Thu, 4 Feb 2010 10:41:59 +0000 (10:41 +0000)
commit3569038ffec0c133ff29f80d506f334cc0f2ddb3
treed53ed10b73c27dc495bcb51491b7b30d25d068bc
parentbd202b822401989aa1abe3e2ad24344d71d6dfb3
Further bug fixes for enable/disables DEF files mechanism on Symbian

Fix bug where all target types, including apps, plugins and static
libraries were getting DEFFILE statements - now it's just libraries that
get it.

Fix bug where duplicate DEFFILE blocks were being added to projects that
manually specified their own DEFFILE - this now tests for the qmake
variable "defBlock" being set, and doesn't add additional DEFFILE
statements if it is.
NOTE: This means that adding DEFFILE statements to MMP_RULES
manually should be done by creating a variable called defBlock, and
adding that to the MMP_RULES (ie. MMP_RULES += defBlock)

Fix bug in configure.exe, where using -nokia-developer for Windows builds
would warn about Symbian DEF file usage (or lack thereof)

Reviewed-by: Janne Koskinen
Reviewed-by: Jason Barron
configure.exe
mkspecs/features/symbian/def_files.prf
mkspecs/features/symbian/def_files_disabled.prf
tools/configure/configureapp.cpp