# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1284701263 -10800 # Node ID 4956c89a3c3f8553a30289360a1ef7624d79d330 # Parent 88ff81299c113c856e2ca2fae165f2c497542dbd Revision: 201035 Kit: 201037 diff -r 88ff81299c11 -r 4956c89a3c3f ftu.pro --- a/ftu.pro Wed Aug 18 09:39:42 2010 +0300 +++ b/ftu.pro Fri Sep 17 08:27:43 2010 +0300 @@ -30,4 +30,6 @@ CONFIG += ordered -symbian:include(ftu_exports_to_rom.pri) \ No newline at end of file +symbian:include(ftu_exports_to_rom.pri) + +symbian:MMP_RULES += SMPSAFE diff -r 88ff81299c11 -r 4956c89a3c3f ftuapplication/ftuapplication.pri --- a/ftuapplication/ftuapplication.pri Wed Aug 18 09:39:42 2010 +0300 +++ b/ftuapplication/ftuapplication.pri Fri Sep 17 08:27:43 2010 +0300 @@ -17,4 +17,4 @@ HEADERS += ./inc/*.h SOURCES += ./src/*.cpp - +TRANSLATIONS = firsttimesetup.ts diff -r 88ff81299c11 -r 4956c89a3c3f ftuapplication/ftuapplication.pro --- a/ftuapplication/ftuapplication.pro Wed Aug 18 09:39:42 2010 +0300 +++ b/ftuapplication/ftuapplication.pro Fri Sep 17 08:27:43 2010 +0300 @@ -57,11 +57,9 @@ ICON = resources/ftu_app_icon.svg icon.sources = resources/ftu_app_icon.svg icon.path = /fturesources - addFiles.sources += ../translations/ftu_en_US.qm ../translations/ftu_en_GB.qm \ - ../translations/ftuexamplewizards_en_US.qm ../translations/ftuexamplewizards_en_GB.qm - addFiles.path = translations - DEPLOYMENT += icon addFiles - + + DEPLOYMENT += icon + LIBS += -lxqsettingsmanager RSS_RULES += "hidden = KAppIsHidden;" @@ -76,3 +74,6 @@ } include(ftuapplication.pri) + + +symbian:MMP_RULES += SMPSAFE diff -r 88ff81299c11 -r 4956c89a3c3f ftuapplication/src/main.cpp --- a/ftuapplication/src/main.cpp Wed Aug 18 09:39:42 2010 +0300 +++ b/ftuapplication/src/main.cpp Fri Sep 17 08:27:43 2010 +0300 @@ -52,8 +52,6 @@ ftuFirstTimeUse.start(); int ret = app.exec(); QDEBUG("FTU::FtuFirstTimeUse::main"); - //Work around to make sure that ftu exits - User::Exit(0); delete translator; return ret; } diff -r 88ff81299c11 -r 4956c89a3c3f fturuntimeservices/bwins/fturuntimeservicesu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/fturuntimeservices/bwins/fturuntimeservicesu.def Fri Sep 17 08:27:43 2010 +0300 @@ -0,0 +1,21 @@ +EXPORTS + ?insertWizard@FtuContentService@@QAEXHPAVFtuWizard@@@Z @ 1 NONAME ; void FtuContentService::insertWizard(int, class FtuWizard *) + ?metaObject@FtuContentService@@UBEPBUQMetaObject@@XZ @ 2 NONAME ; struct QMetaObject const * FtuContentService::metaObject(void) const + ?appendWizard@FtuContentService@@QAEXPAVFtuWizard@@@Z @ 3 NONAME ; void FtuContentService::appendWizard(class FtuWizard *) + ??0FtuContentService@@QAE@PAVQObject@@@Z @ 4 NONAME ; FtuContentService::FtuContentService(class QObject *) + ??1FtuContentService@@UAE@XZ @ 5 NONAME ; FtuContentService::~FtuContentService(void) + ?wizardAdded@FtuContentService@@IAEXH@Z @ 6 NONAME ; void FtuContentService::wizardAdded(int) + ?qt_metacall@FtuContentService@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 7 NONAME ; int FtuContentService::qt_metacall(enum QMetaObject::Call, int, void * *) + ?tr@FtuContentService@@SA?AVQString@@PBD0@Z @ 8 NONAME ; class QString FtuContentService::tr(char const *, char const *) + ?getStaticMetaObject@FtuContentService@@SAABUQMetaObject@@XZ @ 9 NONAME ; struct QMetaObject const & FtuContentService::getStaticMetaObject(void) + ?wizards@FtuContentService@@QBE?AV?$QList@PAVFtuWizard@@@@XZ @ 10 NONAME ; class QList FtuContentService::wizards(void) const + ?trUtf8@FtuContentService@@SA?AVQString@@PBD0H@Z @ 11 NONAME ; class QString FtuContentService::trUtf8(char const *, char const *, int) + ?qt_metacast@FtuContentService@@UAEPAXPBD@Z @ 12 NONAME ; void * FtuContentService::qt_metacast(char const *) + ?trUtf8@FtuContentService@@SA?AVQString@@PBD0@Z @ 13 NONAME ; class QString FtuContentService::trUtf8(char const *, char const *) + ?staticMetaObject@FtuContentService@@2UQMetaObject@@B @ 14 NONAME ; struct QMetaObject const FtuContentService::staticMetaObject + ?setActiveWizard@FtuContentService@@QAEXH@Z @ 15 NONAME ; void FtuContentService::setActiveWizard(int) + ??_EFtuContentService@@UAE@I@Z @ 16 NONAME ; FtuContentService::~FtuContentService(unsigned int) + ?activeWizard@FtuContentService@@QBEHXZ @ 17 NONAME ; int FtuContentService::activeWizard(void) const + ?tr@FtuContentService@@SA?AVQString@@PBD0H@Z @ 18 NONAME ; class QString FtuContentService::tr(char const *, char const *, int) + ?wizard@FtuContentService@@QBEPAVFtuWizard@@H@Z @ 19 NONAME ; class FtuWizard * FtuContentService::wizard(int) const + diff -r 88ff81299c11 -r 4956c89a3c3f fturuntimeservices/eabi/fturuntimeservicesu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/fturuntimeservices/eabi/fturuntimeservicesu.def Fri Sep 17 08:27:43 2010 +0300 @@ -0,0 +1,21 @@ +EXPORTS + _ZN17FtuContentService11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME + _ZN17FtuContentService11qt_metacastEPKc @ 2 NONAME + _ZN17FtuContentService11wizardAddedEi @ 3 NONAME + _ZN17FtuContentService12appendWizardEP9FtuWizard @ 4 NONAME + _ZN17FtuContentService12insertWizardEiP9FtuWizard @ 5 NONAME + _ZN17FtuContentService15setActiveWizardEi @ 6 NONAME + _ZN17FtuContentService16staticMetaObjectE @ 7 NONAME DATA 16 + _ZN17FtuContentService19getStaticMetaObjectEv @ 8 NONAME + _ZN17FtuContentServiceC1EP7QObject @ 9 NONAME + _ZN17FtuContentServiceC2EP7QObject @ 10 NONAME + _ZN17FtuContentServiceD0Ev @ 11 NONAME + _ZN17FtuContentServiceD1Ev @ 12 NONAME + _ZN17FtuContentServiceD2Ev @ 13 NONAME + _ZNK17FtuContentService10metaObjectEv @ 14 NONAME + _ZNK17FtuContentService12activeWizardEv @ 15 NONAME + _ZNK17FtuContentService6wizardEi @ 16 NONAME + _ZNK17FtuContentService7wizardsEv @ 17 NONAME + _ZTI17FtuContentService @ 18 NONAME + _ZTV17FtuContentService @ 19 NONAME + diff -r 88ff81299c11 -r 4956c89a3c3f fturuntimeservices/fturuntimeservices.pro --- a/fturuntimeservices/fturuntimeservices.pro Wed Aug 18 09:39:42 2010 +0300 +++ b/fturuntimeservices/fturuntimeservices.pro Fri Sep 17 08:27:43 2010 +0300 @@ -63,8 +63,11 @@ win32 { } include(fturuntimeservices.pri) -system(copy /y .\inc\fturuntimeservices_global.h ..\inc) -system(copy /y .\inc\ftucontentservice.h ..\inc) +system(copy /y .\\inc\\fturuntimeservices_global.h ..\\inc) +system(copy /y .\\inc\\ftucontentservice.h ..\\inc) #ONLY FOR DEVELOPMENT! REMOVE THIS BEFORE EACH HS_Domain RELEASE! -symbian: MMP_RULES += EXPORTUNFROZEN + + + +symbian:MMP_RULES += SMPSAFE diff -r 88ff81299c11 -r 4956c89a3c3f package_definition.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_definition.xml Fri Sep 17 08:27:43 2010 +0300 @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff -r 88ff81299c11 -r 4956c89a3c3f package_map.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_map.xml Fri Sep 17 08:27:43 2010 +0300 @@ -0,0 +1,1 @@ + diff -r 88ff81299c11 -r 4956c89a3c3f runtimeproviders/ftudefaultruntimeprovider/ftudefaultruntimeprovider.pro --- a/runtimeproviders/ftudefaultruntimeprovider/ftudefaultruntimeprovider.pro Wed Aug 18 09:39:42 2010 +0300 +++ b/runtimeproviders/ftudefaultruntimeprovider/ftudefaultruntimeprovider.pro Fri Sep 17 08:27:43 2010 +0300 @@ -86,3 +86,6 @@ for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin z:$$qtplugins.path/$$basename(qtplugin)" } + + +symbian:MMP_RULES += SMPSAFE diff -r 88ff81299c11 -r 4956c89a3c3f stateproviders/ftustateprovider/bwins/ftustateprovideru.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/stateproviders/ftustateprovider/bwins/ftustateprovideru.def Fri Sep 17 08:27:43 2010 +0300 @@ -0,0 +1,15 @@ +EXPORTS + ?tr@FtuStateProvider@@SA?AVQString@@PBD0@Z @ 1 NONAME ; class QString FtuStateProvider::tr(char const *, char const *) + ?metaObject@FtuStateProvider@@UBEPBUQMetaObject@@XZ @ 2 NONAME ; struct QMetaObject const * FtuStateProvider::metaObject(void) const + ?getStaticMetaObject@FtuStateProvider@@SAABUQMetaObject@@XZ @ 3 NONAME ; struct QMetaObject const & FtuStateProvider::getStaticMetaObject(void) + ?tr@FtuStateProvider@@SA?AVQString@@PBD0H@Z @ 4 NONAME ; class QString FtuStateProvider::tr(char const *, char const *, int) + ??_EFtuStateProvider@@UAE@I@Z @ 5 NONAME ; FtuStateProvider::~FtuStateProvider(unsigned int) + ??1FtuStateProvider@@UAE@XZ @ 6 NONAME ; FtuStateProvider::~FtuStateProvider(void) + ??0FtuStateProvider@@QAE@PAVQObject@@@Z @ 7 NONAME ; FtuStateProvider::FtuStateProvider(class QObject *) + ?trUtf8@FtuStateProvider@@SA?AVQString@@PBD0@Z @ 8 NONAME ; class QString FtuStateProvider::trUtf8(char const *, char const *) + ?qt_metacast@FtuStateProvider@@UAEPAXPBD@Z @ 9 NONAME ; void * FtuStateProvider::qt_metacast(char const *) + ?createState@FtuStateProvider@@QAEPAVQState@@ABVQString@@@Z @ 10 NONAME ; class QState * FtuStateProvider::createState(class QString const &) + ?trUtf8@FtuStateProvider@@SA?AVQString@@PBD0H@Z @ 11 NONAME ; class QString FtuStateProvider::trUtf8(char const *, char const *, int) + ?staticMetaObject@FtuStateProvider@@2UQMetaObject@@B @ 12 NONAME ; struct QMetaObject const FtuStateProvider::staticMetaObject + ?qt_metacall@FtuStateProvider@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 13 NONAME ; int FtuStateProvider::qt_metacall(enum QMetaObject::Call, int, void * *) + diff -r 88ff81299c11 -r 4956c89a3c3f stateproviders/ftustateprovider/conf/20026f99.txt Binary file stateproviders/ftustateprovider/conf/20026f99.txt has changed diff -r 88ff81299c11 -r 4956c89a3c3f stateproviders/ftustateprovider/conf/Ftustateprovider_20026f99.crml Binary file stateproviders/ftustateprovider/conf/Ftustateprovider_20026f99.crml has changed diff -r 88ff81299c11 -r 4956c89a3c3f stateproviders/ftustateprovider/conf/ftustateprovider.confml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/stateproviders/ftustateprovider/conf/ftustateprovider.confml Fri Sep 17 08:27:43 2010 +0300 @@ -0,0 +1,74 @@ + + + + Defines various cenrep keys used by FTU State Machine to record info of plugin completion + + Contains date and Time in string format + + + Value is 1 if plugin is complete. Value is 0 if plugin is incomplete + + + Value is 1 if plugin is complete. Value is 0 if plugin is incomplete + + + Value is 1 if plugin is complete. Value is 0 if plugin is incomplete + + + Value is 1 if plugin is complete. Value is 0 if plugin is incomplete + + + Value is 1 if plugin is complete. Value is 0 if plugin is incomplete + + + Value is 1 if plugin is complete. Value is 0 if plugin is incomplete + + + Value is 1 if plugin is complete. Value is 0 if plugin is incomplete + + + Value is 1 if plugin is complete. Value is 0 if plugin is incomplete + + + Value is 1 if plugin is complete. Value is 0 if plugin is incomplete + + + Value is 1 if plugin is complete. Value is 0 if plugin is incomplete + + + Value is 1 if plugin is complete. Value is 0 if plugin is incomplete + + + Value is 1 if plugin is complete. Value is 0 if plugin is incomplete + + + Value is 1 if plugin is complete. Value is 0 if plugin is incomplete + + + Value is 1 if plugin is complete. Value is 0 if plugin is incomplete + + + Value is 1 if plugin is complete. Value is 0 if plugin is incomplete + + + + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + diff -r 88ff81299c11 -r 4956c89a3c3f stateproviders/ftustateprovider/eabi/ftustateprovideru.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/stateproviders/ftustateprovider/eabi/ftustateprovideru.def Fri Sep 17 08:27:43 2010 +0300 @@ -0,0 +1,12 @@ +EXPORTS + _ZN16FtuStateProvider11createStateERK7QString @ 1 NONAME + _ZN16FtuStateProvider11qt_metacallEN11QMetaObject4CallEiPPv @ 2 NONAME + _ZN16FtuStateProvider11qt_metacastEPKc @ 3 NONAME + _ZN16FtuStateProvider16staticMetaObjectE @ 4 NONAME DATA 16 + _ZN16FtuStateProvider19getStaticMetaObjectEv @ 5 NONAME + _ZN16FtuStateProviderC1EP7QObject @ 6 NONAME + _ZN16FtuStateProviderC2EP7QObject @ 7 NONAME + _ZNK16FtuStateProvider10metaObjectEv @ 8 NONAME + _ZTI16FtuStateProvider @ 9 NONAME + _ZTV16FtuStateProvider @ 10 NONAME + diff -r 88ff81299c11 -r 4956c89a3c3f stateproviders/ftustateprovider/ftustateprovider.pro --- a/stateproviders/ftustateprovider/ftustateprovider.pro Wed Aug 18 09:39:42 2010 +0300 +++ b/stateproviders/ftustateprovider/ftustateprovider.pro Fri Sep 17 08:27:43 2010 +0300 @@ -88,4 +88,7 @@ include(ftustateprovider.pri) #ONLY FOR DEVELOPMENT! REMOVE THIS BEFORE EACH HS_Domain RELEASE! -symbian: MMP_RULES += EXPORTUNFROZEN + + + +symbian:MMP_RULES += SMPSAFE diff -r 88ff81299c11 -r 4956c89a3c3f stateproviders/ftustateprovider/src/ftuwizardactivatedstate.cpp --- a/stateproviders/ftustateprovider/src/ftuwizardactivatedstate.cpp Wed Aug 18 09:39:42 2010 +0300 +++ b/stateproviders/ftustateprovider/src/ftuwizardactivatedstate.cpp Fri Sep 17 08:27:43 2010 +0300 @@ -84,7 +84,7 @@ mPluginView->setWidget(widget); mMainWindow->addView(mPluginView); - mPluginView->setTitle(hbTrId("txt_ftu_title_setup")); + mPluginView->setTitle(hbTrId("txt_long_caption_FTU_widget")); mPluginTitleLabel = qobject_cast(mDocumentLoader->findWidget(WIZARD_INFOTEXT_LABEL)); diff -r 88ff81299c11 -r 4956c89a3c3f wizardproviders/ftuwizardprovider/bwins/ftuwizardprovideru.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wizardproviders/ftuwizardprovider/bwins/ftuwizardprovideru.def Fri Sep 17 08:27:43 2010 +0300 @@ -0,0 +1,15 @@ +EXPORTS + ??1FtuWizardProvider@@UAE@XZ @ 1 NONAME ; FtuWizardProvider::~FtuWizardProvider(void) + ?staticMetaObject@FtuWizardProvider@@2UQMetaObject@@B @ 2 NONAME ; struct QMetaObject const FtuWizardProvider::staticMetaObject + ?qt_metacall@FtuWizardProvider@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 3 NONAME ; int FtuWizardProvider::qt_metacall(enum QMetaObject::Call, int, void * *) + ??_EFtuWizardProvider@@UAE@I@Z @ 4 NONAME ; FtuWizardProvider::~FtuWizardProvider(unsigned int) + ?tr@FtuWizardProvider@@SA?AVQString@@PBD0@Z @ 5 NONAME ; class QString FtuWizardProvider::tr(char const *, char const *) + ?getStaticMetaObject@FtuWizardProvider@@SAABUQMetaObject@@XZ @ 6 NONAME ; struct QMetaObject const & FtuWizardProvider::getStaticMetaObject(void) + ?tr@FtuWizardProvider@@SA?AVQString@@PBD0H@Z @ 7 NONAME ; class QString FtuWizardProvider::tr(char const *, char const *, int) + ?trUtf8@FtuWizardProvider@@SA?AVQString@@PBD0H@Z @ 8 NONAME ; class QString FtuWizardProvider::trUtf8(char const *, char const *, int) + ?loadFTUPlugins@FtuWizardProvider@@QAEXAAV?$QList@PAVFtuWizardFactory@@@@@Z @ 9 NONAME ; void FtuWizardProvider::loadFTUPlugins(class QList &) + ?metaObject@FtuWizardProvider@@UBEPBUQMetaObject@@XZ @ 10 NONAME ; struct QMetaObject const * FtuWizardProvider::metaObject(void) const + ??0FtuWizardProvider@@QAE@PAVQObject@@@Z @ 11 NONAME ; FtuWizardProvider::FtuWizardProvider(class QObject *) + ?qt_metacast@FtuWizardProvider@@UAEPAXPBD@Z @ 12 NONAME ; void * FtuWizardProvider::qt_metacast(char const *) + ?trUtf8@FtuWizardProvider@@SA?AVQString@@PBD0@Z @ 13 NONAME ; class QString FtuWizardProvider::trUtf8(char const *, char const *) + diff -r 88ff81299c11 -r 4956c89a3c3f wizardproviders/ftuwizardprovider/eabi/ftuwizardprovideru.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wizardproviders/ftuwizardprovider/eabi/ftuwizardprovideru.def Fri Sep 17 08:27:43 2010 +0300 @@ -0,0 +1,15 @@ +EXPORTS + _ZN17FtuWizardProvider11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME + _ZN17FtuWizardProvider11qt_metacastEPKc @ 2 NONAME + _ZN17FtuWizardProvider14loadFTUPluginsER5QListIP16FtuWizardFactoryE @ 3 NONAME + _ZN17FtuWizardProvider16staticMetaObjectE @ 4 NONAME DATA 16 + _ZN17FtuWizardProvider19getStaticMetaObjectEv @ 5 NONAME + _ZN17FtuWizardProviderC1EP7QObject @ 6 NONAME + _ZN17FtuWizardProviderC2EP7QObject @ 7 NONAME + _ZN17FtuWizardProviderD0Ev @ 8 NONAME + _ZN17FtuWizardProviderD1Ev @ 9 NONAME + _ZN17FtuWizardProviderD2Ev @ 10 NONAME + _ZNK17FtuWizardProvider10metaObjectEv @ 11 NONAME + _ZTI17FtuWizardProvider @ 12 NONAME + _ZTV17FtuWizardProvider @ 13 NONAME + diff -r 88ff81299c11 -r 4956c89a3c3f wizardproviders/ftuwizardprovider/ftuwizardprovider.pro --- a/wizardproviders/ftuwizardprovider/ftuwizardprovider.pro Wed Aug 18 09:39:42 2010 +0300 +++ b/wizardproviders/ftuwizardprovider/ftuwizardprovider.pro Fri Sep 17 08:27:43 2010 +0300 @@ -65,4 +65,7 @@ include(ftuwizardprovider.pri) #ONLY FOR DEVELOPMENT! REMOVE THIS BEFORE EACH HS_Domain RELEASE! -symbian: MMP_RULES += EXPORTUNFROZEN + + + +symbian:MMP_RULES += SMPSAFE