Symbian related changes to .pri & .pro files

15 files changed, 84 insertions, 71 deletions

diff --git a/benchmarks/tst_messageserver/tst_messageserver.pro b/benchmarks/tst_messageserver/tst_messageserver.pro
index b014ebc3..1a397b11 100644
--- a/benchmarks/tst_messageserver/tst_messageserver.pro
+++ b/benchmarks/tst_messageserver/tst_messageserver.pro
@@ -29,8 +29,10 @@ INCLUDEPATH += . 3rdparty $$BASE/src/libraries/qmfclient \
 LIBS += -L$$BASE/src/libraries/qmfmessageserver/build \
         -L$$BASE/src/libraries/qmfclient/build
 
-QMAKE_LFLAGS += -Wl,-rpath,$$BASE/src/libraries/qmfclient \
-    -Wl,-rpath,$$BASE/src/libraries/qmfmessageserver
+!symbian {
+    QMAKE_LFLAGS += -Wl,-rpath,$$BASE/src/libraries/qmfclient \
+        -Wl,-rpath,$$BASE/src/libraries/qmfmessageserver
+}
 
 HEADERS += benchmarkcontext.h \
            qscopedconnection.h \
diff --git a/examples/qtmail/app/app.pro b/examples/qtmail/app/app.pro
index 4eaf2351..f07859a2 100644
--- a/examples/qtmail/app/app.pro
+++ b/examples/qtmail/app/app.pro
@@ -47,4 +47,8 @@ FORMS += searchviewbasephone.ui
 
 RESOURCES += qtmail.qrc
 
+symbian {
+    TARGET.CAPABILITY += ALL -TCB
+}
+
 include(../../../common.pri)
diff --git a/examples/qtmail/libs/qmfutil/qmfutil.pro b/examples/qtmail/libs/qmfutil/qmfutil.pro
index 93d78928..8db6a7a4 100644
--- a/examples/qtmail/libs/qmfutil/qmfutil.pro
+++ b/examples/qtmail/libs/qmfutil/qmfutil.pro
@@ -8,9 +8,13 @@ target.path += $$QMF_INSTALL_ROOT/lib
 DEFINES += QMFUTIL_INTERNAL
 
 symbian: {
-       MMP_RULES += EXPORTUNFROZEN
-       TARGET.EPOCALLOWDLLDATA = 1
-       TARGET.CAPABILITY = ALL -TCB
+    TARGET.EPOCALLOWDLLDATA = 1
+    TARGET.CAPABILITY = ALL -TCB
+    MMP_RULES += EXPORTUNFROZEN
+
+    QMFUtil.sources = $${TARGET}.dll
+    QMFUtil.path = /sys/bin
+    DEPLOYMENT += QMFUtil
 }
 
 DEPENDPATH += .
diff --git a/examples/qtmail/plugins/composers/email/email.pro b/examples/qtmail/plugins/composers/email/email.pro
index a37577c1..c4c86cfe 100644
--- a/examples/qtmail/plugins/composers/email/email.pro
+++ b/examples/qtmail/plugins/composers/email/email.pro
@@ -42,20 +42,17 @@ TRANSLATIONS += libemailcomposer-ar.ts \
 RESOURCES += email.qrc                
 
 symbian: {
-    TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.CAPABILITY = ALL \
-        -TCB
+    load(data_caging_paths)
 
-	PLUGIN_STUB_PATH = /resource/qt/plugins/qtmail/composers
+    TARGET.EPOCALLOWDLLDATA = 1
+    TARGET.CAPABILITY = ALL -TCB
 
     deploy.path = C:
     pluginstub.sources = $${TARGET}.dll
-    pluginstub.path = $$PLUGIN_STUB_PATH
+    pluginstub.path = $$QT_PLUGINS_BASE_DIR/qtmail/composers
     DEPLOYMENT += pluginstub
 
-    qtplugins.path = $$PLUGIN_STUB_PATH
-    qtplugins.sources += qmakepluginstubs/$${TARGET}.qtplugin
-    for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin $$deploy.path$$qtplugins.path/$$basename(qtplugin)"
+    load(armcc_warnings)
 }
 
 include(../../../../../common.pri)
diff --git a/examples/qtmail/plugins/viewers/generic/generic.pro b/examples/qtmail/plugins/viewers/generic/generic.pro
index 070b0c1d..3cae5d02 100644
--- a/examples/qtmail/plugins/viewers/generic/generic.pro
+++ b/examples/qtmail/plugins/viewers/generic/generic.pro
@@ -41,20 +41,17 @@ TRANSLATIONS += libgenericviewer-ar.ts \
                 libgenericviewer-zh_TW.ts
 
 symbian: {
-    TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.CAPABILITY = ALL \
-        -TCB
+    load(data_caging_paths)
 
-	PLUGIN_STUB_PATH = /resource/qt/plugins/qtmail/viewers
+    TARGET.EPOCALLOWDLLDATA = 1
+    TARGET.CAPABILITY = ALL -TCB
 
     deploy.path = C:
     pluginstub.sources = $${TARGET}.dll
-    pluginstub.path = $$PLUGIN_STUB_PATH
+    pluginstub.path = $$QT_PLUGINS_BASE_DIR/qtmail/viewers
     DEPLOYMENT += pluginstub
 
-    qtplugins.path = $$PLUGIN_STUB_PATH
-    qtplugins.sources += qmakepluginstubs/$${TARGET}.qtplugin
-    for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin $$deploy.path$$qtplugins.path/$$basename(qtplugin)"
+    load(armcc_warnings)
 }
 
 include(../../../../../common.pri)
diff --git a/messagingframework.pro b/messagingframework.pro
index 275f159b..0c10099b 100644
--- a/messagingframework.pro
+++ b/messagingframework.pro
@@ -9,6 +9,7 @@ SUBDIRS = src/libraries/qmfclient \
           src/plugins/messageservices/qmfsettings \
           src/plugins/contentmanagers/qmfstoragemanager \
           src/tools/messageserver \
+          tests \
           examples/qtmail/libs/qmfutil \
           examples/qtmail/app \
           examples/qtmail/plugins/viewers/generic \
@@ -16,11 +17,6 @@ SUBDIRS = src/libraries/qmfclient \
           examples/messagingaccounts \
           examples/serverobserver
           
-# disable tests on symbian until ported
-!symbian {
-          SUBDIRS += tests
-}
-
 # disable benchmark test on mac until ported
 !macx {
           SUBDIRS += benchmarks
diff --git a/src/libraries/qmfclient/qmfclient.pro b/src/libraries/qmfclient/qmfclient.pro
index ec7d397d..111c0eed 100644
--- a/src/libraries/qmfclient/qmfclient.pro
+++ b/src/libraries/qmfclient/qmfclient.pro
@@ -13,12 +13,16 @@ win32: {
 
 QT = core sql network
 symbian: {
+    INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.CAPABILITY = ALL \
-        -TCB
+    TARGET.CAPABILITY = ALL -TCB
     LIBS += -lefsrv
     MMP_RULES += EXPORTUNFROZEN
-    INCLUDEPATH += /epoc32/include/platform
+
+    QMFClient.sources = $${TARGET}.dll
+    QMFClient.path = /sys/bin
+    DEPLOYMENT += QMFClient
 }
 
 DEPENDPATH += .
diff --git a/src/libraries/qmfmessageserver/qmfmessageserver.pro b/src/libraries/qmfmessageserver/qmfmessageserver.pro
index 7860a7f4..e36e1079 100644
--- a/src/libraries/qmfmessageserver/qmfmessageserver.pro
+++ b/src/libraries/qmfmessageserver/qmfmessageserver.pro
@@ -13,6 +13,10 @@ symbian: {
     TARGET.CAPABILITY = ALL \
         -TCB
     MMP_RULES += EXPORTUNFROZEN
+
+    QMFServer.sources = $${TARGET}.dll
+    QMFServer.path = /sys/bin
+    DEPLOYMENT += QMFServer
 }
 
 DEFINES += MESSAGESERVER_INTERNAL
diff --git a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro
index fabc991b..0aef7273 100644
--- a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro
+++ b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro
@@ -20,20 +20,17 @@ HEADERS += qmfstoragemanager.h
 SOURCES += qmfstoragemanager.cpp
 
 symbian: {
+    load(data_caging_paths)
+
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.CAPABILITY = ALL \
-        -TCB
-        
-	PLUGIN_STUB_PATH = /resource/qt/plugins/qtmail/contentmanagers
-    
+    TARGET.CAPABILITY = ALL -TCB
+
     deploy.path = C:
     pluginstub.sources = $${TARGET}.dll
-    pluginstub.path = $$PLUGIN_STUB_PATH
+    pluginstub.path = $$QT_PLUGINS_BASE_DIR/qtmail/contentmanagers
     DEPLOYMENT += pluginstub
 
-    qtplugins.path = $$PLUGIN_STUB_PATH
-    qtplugins.sources += qmakepluginstubs/$${TARGET}.qtplugin
-    for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin $$deploy.path$$qtplugins.path/$$basename(qtplugin)" 
+    load(armcc_warnings)
 }
 
 include(../../../../common.pri)
diff --git a/src/plugins/messageservices/imap/imap.pro b/src/plugins/messageservices/imap/imap.pro
index 63214a80..bda8ae1e 100644
--- a/src/plugins/messageservices/imap/imap.pro
+++ b/src/plugins/messageservices/imap/imap.pro
@@ -74,20 +74,17 @@ RESOURCES += imap.qrc
 }
 
 symbian: {
+    load(data_caging_paths)
+
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.CAPABILITY = ALL \
-        -TCB
-        
-	PLUGIN_STUB_PATH = /resource/qt/plugins/qtmail/messageservices
-    
+    TARGET.CAPABILITY = ALL -TCB
+
     deploy.path = C:
     pluginstub.sources = $${TARGET}.dll
-    pluginstub.path = $$PLUGIN_STUB_PATH
+    pluginstub.path = $$QT_PLUGINS_BASE_DIR/qtmail/messageservices
     DEPLOYMENT += pluginstub
 
-    qtplugins.path = $$PLUGIN_STUB_PATH
-    qtplugins.sources += qmakepluginstubs/$${TARGET}.qtplugin
-    for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin $$deploy.path$$qtplugins.path/$$basename(qtplugin)" 
+    load(armcc_warnings)
 }
 
 include(../../../../common.pri)
diff --git a/src/plugins/messageservices/pop/pop.pro b/src/plugins/messageservices/pop/pop.pro
index 0c80b42b..cfc117cd 100644
--- a/src/plugins/messageservices/pop/pop.pro
+++ b/src/plugins/messageservices/pop/pop.pro
@@ -41,20 +41,17 @@ SOURCES += \
 }
 
 symbian: {
+    load(data_caging_paths)
+
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.CAPABILITY = ALL \
-        -TCB
-        
-    PLUGIN_STUB_PATH = /resource/qt/plugins/qtmail/messageservices
-    
+    TARGET.CAPABILITY = ALL -TCB
+
     deploy.path = C:
     pluginstub.sources = $${TARGET}.dll
-    pluginstub.path = $$PLUGIN_STUB_PATH
+    pluginstub.path = $$QT_PLUGINS_BASE_DIR/qtmail/messageservices
     DEPLOYMENT += pluginstub
 
-    qtplugins.path = $$PLUGIN_STUB_PATH
-    qtplugins.sources += qmakepluginstubs/$${TARGET}.qtplugin
-    for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin $$deploy.path$$qtplugins.path/$$basename(qtplugin)" 
+    load(armcc_warnings)
 }
 
 include(../../../../common.pri)
diff --git a/src/plugins/messageservices/qmfsettings/qmfsettings.pro b/src/plugins/messageservices/qmfsettings/qmfsettings.pro
index 720e3779..303e1321 100644
--- a/src/plugins/messageservices/qmfsettings/qmfsettings.pro
+++ b/src/plugins/messageservices/qmfsettings/qmfsettings.pro
@@ -32,9 +32,17 @@ SOURCES += settings.cpp storagelocations.cpp
 }
 
 symbian: {
+    load(data_caging_paths)
+
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.CAPABILITY = ALL \
-        -TCB
+    TARGET.CAPABILITY = ALL -TCB
+
+    deploy.path = C:
+    pluginstub.sources = $${TARGET}.dll
+    pluginstub.path = $$QT_PLUGINS_BASE_DIR/qtmail/messageservices
+    DEPLOYMENT += pluginstub
+
+    load(armcc_warnings)
 }
 
 include(../../../../common.pri)
diff --git a/src/plugins/messageservices/smtp/smtp.pro b/src/plugins/messageservices/smtp/smtp.pro
index 13fafd55..331dc59a 100644
--- a/src/plugins/messageservices/smtp/smtp.pro
+++ b/src/plugins/messageservices/smtp/smtp.pro
@@ -41,20 +41,17 @@ SOURCES += \
 }
 
 symbian: {
+    load(data_caging_paths)
+
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.CAPABILITY = ALL \
-        -TCB
+    TARGET.CAPABILITY = ALL -TCB
 
-	PLUGIN_STUB_PATH = /resource/qt/plugins/qtmail/messageservices
-    
     deploy.path = C:
     pluginstub.sources = $${TARGET}.dll
-    pluginstub.path = $$PLUGIN_STUB_PATH
+    pluginstub.path = $$QT_PLUGINS_BASE_DIR/qtmail/messageservices
     DEPLOYMENT += pluginstub
 
-    qtplugins.path = $$PLUGIN_STUB_PATH
-    qtplugins.sources += qmakepluginstubs/$${TARGET}.qtplugin
-    for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin $$deploy.path$$qtplugins.path/$$basename(qtplugin)" 
+    load(armcc_warnings)
 }
 
 
diff --git a/tests/tests.pri b/tests/tests.pri
index c2923083..73792815 100644
--- a/tests/tests.pri
+++ b/tests/tests.pri
@@ -9,7 +9,7 @@ DEPENDPATH += .
 INCLUDEPATH += . $$QMFPATH $$QMFPATH/support
 LIBS += -L$$QMFPATH/build
 macx:LIBS += -F$$QMFPATH/build
-QMAKE_LFLAGS += -Wl,-rpath,$$QMFPATH
+!symbian:QMAKE_LFLAGS += -Wl,-rpath,$$QMFPATH
 
 include(../common.pri)
 
diff --git a/tests/tst_python_email/tst_python_email.pro b/tests/tst_python_email/tst_python_email.pro
index 745a30f3..27b2e28c 100644
--- a/tests/tst_python_email/tst_python_email.pro
+++ b/tests/tst_python_email/tst_python_email.pro
@@ -2,12 +2,21 @@ TEMPLATE = app
 CONFIG += qtestlib unittest qmfclient
 TARGET = tst_python_email
 
-DEFINES += SRCDIR=\\\"$$_PRO_FILE_PWD_\\\"
+!symbian {
+    DEFINES += SRCDIR=\\\"$$_PRO_FILE_PWD_\\\"
 
-testdata.path = $$QMF_INSTALL_ROOT/tests/testdata 
-testdata.files = testdata/
+    testdata.path = $$QMF_INSTALL_ROOT/tests/testdata
+    testdata.files = testdata/
 
-INSTALLS += testdata
+    INSTALLS += testdata
+}
+
+symbian {
+    testdata.sources = testdata/*
+    testdata.path = testdata
+
+    DEPLOYMENT += testdata
+}
 
 SOURCES += tst_python_email.cpp