--- a/browserutilities/group/bld.inf Tue Jul 06 15:28:29 2010 +0300
+++ b/browserutilities/group/bld.inf Fri Sep 17 08:35:41 2010 +0300
@@ -15,21 +15,21 @@
*
*/
-#include "../browserdialogsprovider/Group/bld.inf"
-#include "../recenturlstore/group/bld.inf"
+//#include "../browserdialogsprovider/Group/bld.inf"
+//#include "../recenturlstore/group/bld.inf"
//#include "../xmlparser/group/bld.inf"
//#include "../cxmllibrary/group/BLD.INF"
-#include "../downloadmgr/Group/bld.inf"
-#include "../connectionmanager/Group/bld.inf"
-#include "../browsertelservice/group/bld.inf"
+//#include "../downloadmgr/Group/bld.inf"
+//#include "../connectionmanager/Group/bld.inf"
+//#include "../browsertelservice/group/bld.inf"
#include "../favouritesengine/group/bld.inf"
-#include "../feedsengine/group/bld.inf"
-#ifdef BRDO_MULTIPART_PARSER_FF
-#include "../multipartparser/group/bld.inf"
-#endif
-#include "../schemehandler/Group/bld.inf"
+//#include "../feedsengine/group/bld.inf"
+//#ifdef BRDO_MULTIPART_PARSER_FF
+//#include "../multipartparser/group/bld.inf"
+//#endif
+//#include "../schemehandler/Group/bld.inf"
#include "../webutils/group/bld.inf"
-#include "../aiwbrowserprovider/Group/bld.inf"
+//#include "../aiwbrowserprovider/Group/bld.inf"
PRJ_PLATFORMS
--- a/browserutilities/schemehandler/SchemeApp/data/SchemeApp.rss Tue Jul 06 15:28:29 2010 +0300
+++ b/browserutilities/schemehandler/SchemeApp/data/SchemeApp.rss Fri Sep 17 08:35:41 2010 +0300
@@ -87,3 +87,4 @@
}
};
}
+
--- a/browserutilities/schemehandler/SchemeDispatcher/group/SchemeDispatcher.mmp Tue Jul 06 15:28:29 2010 +0300
+++ b/browserutilities/schemehandler/SchemeDispatcher/group/SchemeDispatcher.mmp Fri Sep 17 08:35:41 2010 +0300
@@ -40,13 +40,13 @@
SOURCE DllEntryPoint.cpp
SOURCE BaseHandler.cpp
SOURCE SchemeProxy.cpp
-SOURCE FileHandler.cpp
-SOURCE HttpHandler.cpp
+//SOURCE FileHandler.cpp
+//SOURCE HttpHandler.cpp
SOURCE RtspHandler.cpp
-SOURCE MailToHandler.cpp
-SOURCE WtaiHandler.cpp
-SOURCE TelHandler.cpp
-SOURCE CtiHandler.cpp
+//SOURCE MailToHandler.cpp
+//SOURCE WtaiHandler.cpp
+//SOURCE TelHandler.cpp
+//SOURCE CtiHandler.cpp
SOURCE MmsHandler.cpp
USERINCLUDE ../inc
@@ -63,7 +63,7 @@
LIBRARY apmime.lib
LIBRARY apparc.lib
LIBRARY efsrv.lib
-LIBRARY BrowserTelService.lib
+//LIBRARY BrowserTelService.lib
LIBRARY INETPROTUTIL.LIB
LIBRARY estor.lib
LIBRARY ws32.lib
--- a/browserutilities/schemehandler/SchemeDispatcher/src/BaseHandler.cpp Tue Jul 06 15:28:29 2010 +0300
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/BaseHandler.cpp Fri Sep 17 08:35:41 2010 +0300
@@ -21,14 +21,14 @@
// INCLUDE FILES
#include "BaseHandler.h"
-#include "BrowserTelService.h"
+//#include "BrowserTelService.h"
#include "SchemeDispLogger.h"
#include <e32base.h>
#include <AknQueryDialog.h>
#include <StringLoader.h>
#include <bautils.h>
#include <escapeutils.h>
-#include <BrowserUiSDKCRKeys.h>
+//#include <BrowserUiSDKCRKeys.h>
#include <centralrepository.h>
#include <apgcli.h>
@@ -122,7 +122,7 @@
/* There was no error */
case KErrNone:
return;
- /* to be shown note */
+ /* to be shown note
case KErrInvocationError:
case KErrNoCallActive:
case KErrUserNoAnswer:
@@ -138,6 +138,7 @@
errCode = KErrCancel;
}
break;
+ */
default:
break;
}
@@ -150,10 +151,10 @@
//
TBool CBaseHandler::ReadSdConfirmDtmfValueL()
{
- CRepository* repository = CRepository::NewL( KCRUidBrowser );
+// CRepository* repository = CRepository::NewL( KCRUidBrowser );
TInt retVal = 0;
- repository->Get( KBrowserConfirmDTMFSending, retVal );
- delete repository;
+// repository->Get( KBrowserConfirmDTMFSending, retVal );
+// delete repository;
return retVal;
}
--- a/browserutilities/schemehandler/SchemeDispatcher/src/SchemeProxy.cpp Tue Jul 06 15:28:29 2010 +0300
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/SchemeProxy.cpp Fri Sep 17 08:35:41 2010 +0300
@@ -18,13 +18,13 @@
*/
-#include "FileHandler.h"
-#include "HttpHandler.h"
+//#include "FileHandler.h"
+//#include "HttpHandler.h"
#include "RtspHandler.h"
-#include "MailToHandler.h"
-#include "WtaiHandler.h"
-#include "TelHandler.h"
-#include "CtiHandler.h"
+//#include "MailToHandler.h"
+//#include "WtaiHandler.h"
+//#include "TelHandler.h"
+//#include "CtiHandler.h"
#include "MmsHandler.h"
#include <e32std.h>
#include <SchemeDefs.hrh>
@@ -34,14 +34,14 @@
// Define the interface UIDs
const TImplementationProxy ImplementationTable[] =
{
- IMPLEMENTATION_PROXY_ENTRY( SCHEME_FILE_IMP, CFileHandler::NewL ),
- IMPLEMENTATION_PROXY_ENTRY( SCHEME_HTTP_IMP, CHttpHandler::NewL ),
- IMPLEMENTATION_PROXY_ENTRY( SCHEME_HTTPS_IMP, CHttpHandler::NewL ),
+// IMPLEMENTATION_PROXY_ENTRY( SCHEME_FILE_IMP, CFileHandler::NewL ),
+// IMPLEMENTATION_PROXY_ENTRY( SCHEME_HTTP_IMP, CHttpHandler::NewL ),
+// IMPLEMENTATION_PROXY_ENTRY( SCHEME_HTTPS_IMP, CHttpHandler::NewL ),
IMPLEMENTATION_PROXY_ENTRY( SCHEME_RTSP_IMP, CRtspHandler::NewL ),
- IMPLEMENTATION_PROXY_ENTRY( SCHEME_MAIL_TO_IMP, CMailToHandler::NewL ),
- IMPLEMENTATION_PROXY_ENTRY( SCHEME_WTAI_IMP, CWtaiHandler::NewL ),
- IMPLEMENTATION_PROXY_ENTRY( SCHEME_TEL_IMP, CTelHandler::NewL ),
- IMPLEMENTATION_PROXY_ENTRY( SCHEME_CTI_IMP, CCtiHandler::NewL ),
+// IMPLEMENTATION_PROXY_ENTRY( SCHEME_MAIL_TO_IMP, CMailToHandler::NewL ),
+// IMPLEMENTATION_PROXY_ENTRY( SCHEME_WTAI_IMP, CWtaiHandler::NewL ),
+// IMPLEMENTATION_PROXY_ENTRY( SCHEME_TEL_IMP, CTelHandler::NewL ),
+// IMPLEMENTATION_PROXY_ENTRY( SCHEME_CTI_IMP, CCtiHandler::NewL ),
IMPLEMENTATION_PROXY_ENTRY( SCHEME_MMS_IMP, CMmsHandler::NewL )
};
--- a/group/bld.inf Tue Jul 06 15:28:29 2010 +0300
+++ b/group/bld.inf Fri Sep 17 08:35:41 2010 +0300
@@ -22,12 +22,12 @@
#include "../web_plat/group/bld.inf"
#include "../web_pub/group/bld.inf"
#include "../browserutilities/group/bld.inf"
-#include "../webengine/group/bld.inf"
-#include "../codhandler/group/bld.inf"
+//#include "../webengine/group/bld.inf"
+//#include "../codhandler/group/bld.inf"
-#ifdef RD_BROWSER_WIDGETS
-#include "../widgets/group/bld.inf"
-#endif
+//#ifdef RD_BROWSER_WIDGETS
+//#include "../widgets/group/bld.inf"
+//#endif
PRJ_PLATFORMS
DEFAULT
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml Fri Sep 17 08:35:41 2010 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="web" name="Web" levels="plugin utils support main">
+ <collection id="web" name="Web Engine" level="support">
+ <component id="web_build" name="Web Engine Build" introduced="^4" filter="s60">
+ <unit bldFile="group" />
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml Fri Sep 17 08:35:41 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="mw"/>
--- a/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh Tue Jul 06 15:28:29 2010 +0300
+++ b/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh Fri Sep 17 08:35:41 2010 +0300
@@ -26,8 +26,6 @@
#ifndef BROWSER_PLATFORM_VARIANT_HRH
#define BROWSER_PLATFORM_VARIANT_HRH
-#warning The Browser Platfrom API will be removed wk25. Please see http://wikis.in.nokia.com/Browser/APIMigration for more information
-
/*
* Establish which platform we are building on.
* If required, un-comment correct platform macro as
--- a/web_plat/group/bld.inf Tue Jul 06 15:28:29 2010 +0300
+++ b/web_plat/group/bld.inf Fri Sep 17 08:35:41 2010 +0300
@@ -18,24 +18,26 @@
#include "../browser_platform_api/inc/Browser_platform_variant.hrh"
-#include "../aiw_browser_provider_api/group/bld.inf"
-#include "../browser_dialogs_provider_api/group/bld.inf"
+//#include "../aiw_browser_provider_api/group/bld.inf"
+//#include "../browser_dialogs_provider_api/group/bld.inf"
#include "../browser_platform_api/group/bld.inf"
-#include "../cod_handler_api/group/bld.inf"
-#include "../connection_manager_api/group/bld.inf"
+//#include "../cod_handler_api/group/bld.inf"
+//#include "../connection_manager_api/group/bld.inf"
//#include "../cxml_library_api/group/bld.inf"
-#include "../download_mgr_client_api_extn/group/bld.inf"
-#include "../feeds_engine_api/group/bld.inf"
-#include "../launcher_api/group/bld.inf"
-#ifdef BRDO_MULTIPART_PARSER_FF
-#include "../multipart_parser_api/group/bld.inf"
-#endif
-#include "../recent_url_store_api/group/bld.inf"
-#include "../rt_gesturehelper_api/group/bld.inf"
-#include "../scheme_handler_plugin_api/group/bld.inf"
-#include "../scriptable_plugin_api/group/bld.inf"
+//#include "../download_mgr_client_api_extn/group/bld.inf"
+//#include "../feeds_engine_api/group/bld.inf"
+//#include "../launcher_api/group/bld.inf"
+//#ifdef BRDO_MULTIPART_PARSER_FF
+//#include "../multipart_parser_api/group/bld.inf"
+//#endif
+//#include "../recent_url_store_api/group/bld.inf"
+//#include "../rt_gesturehelper_api/group/bld.inf"
+
+//#include "../scheme_handler_plugin_api/group/bld.inf"
+
+//#include "../scriptable_plugin_api/group/bld.inf"
#include "../webutils_api/group/bld.inf"
-#include "../widget_registry_api/group/bld.inf"
+//#include "../widget_registry_api/group/bld.inf"
//#include "../xml_parser_api/group/bld.inf"
PRJ_PLATFORMS
--- a/web_pub/group/bld.inf Tue Jul 06 15:28:29 2010 +0300
+++ b/web_pub/group/bld.inf Fri Sep 17 08:35:41 2010 +0300
@@ -17,12 +17,12 @@
-#include "../browser_control_api/group/bld.inf"
-#include "../download_mgr_client_api/group/bld.inf"
-#include "../download_mgr_ui_api/group/Bld.inf"
+//#include "../browser_control_api/group/bld.inf"
+//#include "../download_mgr_client_api/group/bld.inf"
+//#include "../download_mgr_ui_api/group/Bld.inf"
#include "../favourites_engine_api/group/bld.inf"
-#include "../browser_plugin_api/group/bld.inf"
-#include "../settings_api/group/bld.inf"
+//#include "../browser_plugin_api/group/bld.inf"
+//#include "../settings_api/group/bld.inf"
PRJ_PLATFORMS
DEFAULT