--- a/qtcontactsmobility/common.pri	Fri Apr 16 14:53:18 2010 +0300
+++ b/qtcontactsmobility/common.pri	Mon May 03 12:24:20 2010 +0300
@@ -4,14 +4,19 @@
 #
 ######################################################################
 
+
 CONFIG(debug, debug|release) {
     WAS_IN_DEBUG=debug
 } else {
     WAS_IN_DEBUG=release
 }
 
-include(pathconfig.pri)
-include($$QT_MOBILITY_BUILD_TREE/config.pri)
+include(staticconfig.pri)
+
+symbian:contains(symbian_symbols_unfrozen,1) {
+    #see configure.bat for details
+    MMP_RULES+="EXPORTUNFROZEN"
+}
 
 mac {
     contains(QT_CONFIG, qt_framework):contains(TEMPLATE, lib) {
@@ -80,8 +85,12 @@
 !testcase {
     OBJECTS_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET
     !plugin {
-        contains(TEMPLATE,.*lib):DESTDIR = $$OUTPUT_DIR/lib
-        else:DESTDIR = $$OUTPUT_DIR/bin
+        contains(TEMPLATE,.*lib) {
+            DESTDIR = $$OUTPUT_DIR/lib
+            symbian:defFilePath=../s60installs
+        } else {
+            DESTDIR = $$OUTPUT_DIR/bin
+        }
     } else {
         testplugin:DESTDIR = $$OUTPUT_DIR/build/tests/bin/plugins/$$PLUGIN_TYPE
         !testplugin:DESTDIR = $$OUTPUT_DIR/plugins/$$PLUGIN_TYPE
@@ -104,11 +113,20 @@
     QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
 }
 
+contains(TEMPLATE,.*lib):DEFINES += QT_SHARED
+
 maemo6 {
     DEFINES+= Q_WS_MAEMO_6
+    contains(TEMPLATE,.*app.*): QMAKE_LIB_FLAGS+= -Wl,-rpath-link $$[QT_INSTALL_LIBS]
+    QMAKE_LIB_FLAGS+= -Wl,-rpath-link $$[QT_INSTALL_LIBS]
+    QMAKE_RPATHDIR += $$[QT_INSTALL_LIBS]
 }
 maemo5 {
     DEFINES+= Q_WS_MAEMO_5
+    LIBS += -lgconf-2 -lrtcom-eventlogger -lmodest-dbus-client-1.0 -losso -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 -ltpsession -ltelepathy-qt4}
+maemo* {
+    LIBS += -L/opt/qt4-maemo5/lib
+    QMAKE_LFLAGS += -Wl,-rpath,/opt/qt4-maemo5/lib
 }
 
 wince* {
@@ -151,5 +169,7 @@
 }
 LIBS += -L$$OUTPUT_DIR/lib
 
+
 DEPENDPATH += . $$SOURCE_DIR
 INCLUDEPATH += $$SOURCE_DIR/src/global
+