--- a/mpengine/tsrc/unittest_mpmpxcollectionframeworkwrapper/unittest_mpmpxcollectionframeworkwrapper.pro	Fri Jun 25 17:21:37 2010 -0500
+++ b/mpengine/tsrc/unittest_mpmpxcollectionframeworkwrapper/unittest_mpmpxcollectionframeworkwrapper.pro	Fri Jul 09 16:27:03 2010 -0500
@@ -11,46 +11,51 @@
 #
 # Contributors:
 #
-# Description: Unit test for mpmpxframeworkwrapper
+# Description: mpmpxcollectionframeworkwrapper unit test project file.
 #
 
 TEMPLATE = app
-CONFIG += qtestlib
-CONFIG += symbian_test
+CONFIG += qtestlib hb symbian_test
 TARGET = unittest_mpmpxcollectionframeworkwrapper
 TARGET.CAPABILITY = All -TCB
 
+symbian: { 
+    MMP_RULES += SMPSAFE
+}
+
 DEPENDPATH += .
 INCLUDEPATH += . \
-    ../../inc \
-    ../../../inc
+               ../../inc \
+               ../../../inc
 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
 LIBS += -lestor.dll \
-    -lfbscli.dll \
-    -lmpxcommon.dll \
-    -lmpxcollectionutility.dll
+        -lfbscli.dll \
+        -lmpxcommon.dll \
+        -lmpxcollectionutility.dll
 
 HEADERS += inc/unittest_mpmpxcollectionframeworkwrapper.h \
-    ../../inc/mpmpxcollectionframeworkwrapper.h \
-    ../../inc/mpmpxcollectionframeworkwrapper_p.h \
-    stub/inc/mpmpxcollectiondata.h \
-    stub/inc/mpxcollectionopenutility.h \
-    stub/inc/mpxcollectionuihelper.h \
-    stub/inc/mpxcollectionutility.h \
-    stub/inc/mpxcollectionhelperfactory.h \
-    stub/inc/mpxplaybackutility.h \
-    stub/inc/mpmpxisolatedcollectionhelper.h \
-    stub/inc/mpsettingsmanager.h
+          ../../inc/mpmpxcollectionframeworkwrapper.h \
+          ../../inc/mpmpxcollectionframeworkwrapper_p.h \
+          stub/inc/mpmpxcollectiondata.h \
+          stub/inc/mpxcollectionopenutility.h \
+          stub/inc/mpxcollectionuihelper.h \
+          stub/inc/mpxcollectionutility.h \
+          stub/inc/mpxcollectionhelperfactory.h \
+          stub/inc/mpxplaybackutility.h \
+          stub/inc/mpmpxisolatedcollectionhelper.h \
+          stub/inc/mpsettingsmanager.h \
+          stub/inc/mpsongdata.h
 
 SOURCES += src/unittest_mpmpxcollectionframeworkwrapper.cpp \
-    ../../src/mpmpxcollectionframeworkwrapper.cpp \
-    stub/src/mpmpxcollectiondata.cpp \
-    stub/src/mpxcollectionopenutility.cpp \
-    stub/src/mpxcollectionuihelper.cpp \
-    stub/src/mpxcollectionutility.cpp \
-    stub/src/mpxcollectionhelperfactory.cpp \
-    stub/src/mpxplaybackutility.cpp \
-    stub/src/mpmpxisolatedcollectionhelper.cpp \
-    stub/src/mpsettingsmanager.cpp
+          ../../src/mpmpxcollectionframeworkwrapper.cpp \
+          stub/src/mpmpxcollectiondata.cpp \
+          stub/src/mpxcollectionopenutility.cpp \
+          stub/src/mpxcollectionuihelper.cpp \
+          stub/src/mpxcollectionutility.cpp \
+          stub/src/mpxcollectionhelperfactory.cpp \
+          stub/src/mpxplaybackutility.cpp \
+          stub/src/mpmpxisolatedcollectionhelper.cpp \
+          stub/src/mpsettingsmanager.cpp \
+          stub/src/mpsongdata.cpp