diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-24 19:51:35 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-24 19:51:35 +1000 |
| commit | 15c0b8ee57069e07d7559714ed5b9abeaa75be9d (patch) | |
| tree | decfb78a5a631b699c25c9f5b3b60dbe35575595 /plugins | |
| parent | d1969b209f490822c89dbb586df4dfcadff9c5e5 (diff) | |
| parent | d70441e07e31845416964c0b600f55f9f8ffafbf (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework into master-integration
* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework:
Fix Symbian file cases for building on Linux host.
Diffstat (limited to 'plugins')
4 files changed, 6 insertions, 6 deletions
diff --git a/plugins/contacts/symbian/contactsmodel/group/cntmodeltest.iby b/plugins/contacts/symbian/contactsmodel/group/cntmodeltest.iby index fb15371e84..cb44f2888d 100644 --- a/plugins/contacts/symbian/contactsmodel/group/cntmodeltest.iby +++ b/plugins/contacts/symbian/contactsmodel/group/cntmodeltest.iby @@ -84,12 +84,12 @@ define CNTMODEL_DATA Core-Apps\App-Engines\CntModel\Databases data=DATAZ_\CNTMODEL_DATA\SQLite__Contacts.cdb CNTMODEL_DATA\SQLite__Contacts.cdb data=DATAZ_\CNTMODEL_DATA\SQLite__Contacts58920.cdb CNTMODEL_DATA\SQLite__Contacts58920.cdb -file=ABI_DIR\BUILD_DIR\t_launchTest.exe System\Programs\cntmodeltest\t_launchTest.exe +file=ABI_DIR\BUILD_DIR\t_launchtest.exe System\Programs\cntmodeltest\t_launchtest.exe file=ABI_DIR\BUILD_DIR\t_item.exe System\Programs\cntmodeltest\t_item.exe file=ABI_DIR\BUILD_DIR\t_field.exe System\Programs\cntmodeltest\t_field.exe file=ABI_DIR\BUILD_DIR\t_dbase2.exe System\Programs\cntmodeltest\t_dbase2.exe file=ABI_DIR\BUILD_DIR\t_view.exe System\Programs\cntmodeltest\t_view.exe -file=ABI_DIR\BUILD_DIR\t_templ.EXE System\Programs\cntmodeltest\t_templ.exe +file=ABI_DIR\BUILD_DIR\t_templ.exe System\Programs\cntmodeltest\t_templ.exe file=ABI_DIR\BUILD_DIR\t_vers.exe System\Programs\cntmodeltest\t_vers.exe file=ABI_DIR\BUILD_DIR\t_expdel.exe System\Programs\cntmodeltest\t_expdel.exe file=ABI_DIR\BUILD_DIR\t_ttvers.exe System\Programs\cntmodeltest\t_ttvers.exe diff --git a/plugins/contacts/symbian/contactsmodel/groupsql/cntmodelteftest.iby b/plugins/contacts/symbian/contactsmodel/groupsql/cntmodelteftest.iby index 77afcee54b..cf7cf835d5 100644 --- a/plugins/contacts/symbian/contactsmodel/groupsql/cntmodelteftest.iby +++ b/plugins/contacts/symbian/contactsmodel/groupsql/cntmodelteftest.iby @@ -22,8 +22,8 @@ #include <cntperftestserver.iby> #include <te_performancefunctionalitysuite.iby> -#include <TE_Cntsrv_API_Policing.IBY> -#include <TestContactSuite.iby> +#include <te_cntsrv_api_policing.iby> +#include <testcontactsuite.iby> #include <tef_cntmodelcit.iby> diff --git a/plugins/multimedia/symbian/ecam/camera_s60.pri b/plugins/multimedia/symbian/ecam/camera_s60.pri index c3d9164cca..6f7d023376 100644 --- a/plugins/multimedia/symbian/ecam/camera_s60.pri +++ b/plugins/multimedia/symbian/ecam/camera_s60.pri @@ -94,7 +94,7 @@ symbian:LIBS += \ -lmediaclientvideo \ -lecam \ -lbafl \ - -lPlatformEnv \ + -lplatformenv \ -lcharconv \ -lconvnames \ -lgb2312_shared \ diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.h b/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.h index 78f018f3f6..b2801470df 100644 --- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.h +++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.h @@ -59,7 +59,7 @@ #include <mmf/common/mmfutilities.h> #ifdef AUDIOINPUT_ROUTING -#include <audioinput.h> +#include <AudioInput.h> #endif //AUDIOINPUT_ROUTING QT_BEGIN_NAMESPACE |