--- a/qtms/qtmsapi.pro	Fri Jun 11 19:35:01 2010 -0500
+++ b/qtms/qtmsapi.pro	Thu Jun 17 11:11:56 2010 -0500
@@ -1,5 +1,4 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
 # under the terms of "Eclipse Public License v1.0"
@@ -11,7 +10,7 @@
 #
 # Contributors:
 #
-# Description: 
+# Description:  QTMS API project description
 #
 
 TEMPLATE = lib
@@ -29,21 +28,20 @@
 TARGET.UID3 = 0x10207CA5
 
 BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>" \
-                             "rom/qtms.iby  CORE_MW_LAYER_IBY_EXPORT_PATH(qtms.iby)" \
+                             "rom/qtms.iby CORE_MW_LAYER_IBY_EXPORT_PATH(qtms.iby)" \
                              "data/qtmsapi_stub.sis /epoc32/data/z/system/install/qtmsapi_stub.sis"
 
 DEPENDPATH += . inc
 INCLUDEPATH += . \
                .\inc
 
-qtmsDefFiles = \
-        "$${LITERAL_HASH}ifdef WINSCW" \
-        "DEFFILE bwins/qtms.def" \
-        "$${LITERAL_HASH}else" \
-        "DEFFILE eabi/qtms.def" \
-        "$${LITERAL_HASH}endif"
-
-MMP_RULES += qtmsDefFiles
+defBlock = \
+           "$${LITERAL_HASH}if defined(EABI)" \
+           "DEFFILE  eabi/qtms.def" \
+           "$${LITERAL_HASH}else" \
+           "DEFFILE  bwins/qtms.def" \
+           "$${LITERAL_HASH}endif"
+MMP_RULES += defBlock
 
 INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE \
                $$OS_LAYER_LIBC_SYSTEMINCLUDE \