Changeset 14745 for S60/trunk/S60WebUi

Show
Ignore:
Timestamp:
06/06/06 12:10:28 (3 years ago)
Author:
brmorris
Message:

2006-06-06 Sachin <sachin.padma@nokia.com>

Reviewed by Zalan/Bradley


Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=9332


  • WebKit\group\icons.mk
  • WebKit\group\webkit.mmp
  • S60WebUi\WebUi\group\WebUi.mmp


Remove relative include paths for data_caging_paths.hrh,
rely on include path instead.


  • S60Internals\S60Headers.zip


Moved data_caging_paths.hrh out of oem to \epoc32\include.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • S60/trunk/S60WebUi/WebUi/group/WebUi.mmp

    r14549 r14745  
    1010*    All rights reserved. 
    1111*   
    12 *       Redistribution and use in source and binary forms, with or without 
    13 *       modification, are permitted provided that the following conditions 
    14 *       are met: 
     12*   Redistribution and use in source and binary forms, with or without 
     13*   modification, are permitted provided that the following conditions 
     14*   are met: 
    1515*   
    1616*      * Redistributions of source code must retain the above copyright 
    … …  
    2424*        from this software without specific prior written permission. 
    2525*   
    26 *       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
    27 *       "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
    28 *       LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
    29 *       A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
    30 *       OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
    31 *       SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
    32 *       LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
    33 *       DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
    34 *       THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
    35 *       (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE 
    36 *       USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
    37 *       DAMAGE. 
     26*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
     27*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
     28*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
     29*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
     30*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
     31*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
     32*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
     33*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
     34*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
     35*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE 
     36*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
     37*   DAMAGE. 
    3838*   
    3939*    Please see file patentlicense.txt for further grants. 
    … …  
    4242 
    4343 
    44 #include "..\..\..\epoc32\include\oem\data_caging_paths.hrh" 
     44#include <data_caging_paths.hrh> 
    4545 
    4646TARGET      WebUi.exe