Changeset 61338 in webkit


Ignore:
Timestamp:
Jun 17, 2010 10:46:41 AM (14 years ago)
Author:
chang.shu@nokia.com
Message:

2010-06-17 Shu Chang <chang.shu@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Fix the link error on symbian with ENABLE_JIT=0.

  1. Add "#if ENABLE(JIT)" in the header file;
  2. Put feature enable/disable logic to a common.pri so that both JavaScriptCore.pri and WebCore.pri can share.

https://bugs.webkit.org/show_bug.cgi?id=40780

2010-06-17 Shu Chang <chang.shu@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Fix the link error on symbian with ENABLE_JIT=0.

  1. Add "#if ENABLE(JIT)" in the header file;
  2. Put feature enable/disable logic to a common.pri so that both JavaScriptCore.pri and WebCore.pri can share.

https://bugs.webkit.org/show_bug.cgi?id=40780

  • common.pri: Added.

2010-06-17 Shu Chang <chang.shu@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Fix the link error on symbian with ENABLE_JIT=0.

  1. Add "#if ENABLE(JIT)" in the header file;
  2. Put feature enable/disable logic to a common.pri so that both JavaScriptCore.pri and WebCore.pri can share.

https://bugs.webkit.org/show_bug.cgi?id=40780

  • WebCore.pri:
Location:
trunk
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r61325 r61338  
     12010-06-17  Shu Chang  <chang.shu@nokia.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] Fix the link error on symbian with ENABLE_JIT=0.
     6        1. Add "#if ENABLE(JIT)" in the header file;
     7        2. Put feature enable/disable logic to a common.pri so
     8        that both JavaScriptCore.pri and WebCore.pri can share.
     9
     10        https://bugs.webkit.org/show_bug.cgi?id=40780
     11
     12        * common.pri: Added.
     13
    1142010-06-17  Alexis Menard  <alexis.menard@nokia.com>
    215
  • trunk/JavaScriptCore/ChangeLog

    r61324 r61338  
     12010-06-17  Shu Chang  <chang.shu@nokia.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] Fix the link error on symbian with ENABLE_JIT=0.
     6        1. Add "#if ENABLE(JIT)" in the header file;
     7        2. Put feature enable/disable logic to a common.pri so
     8        that both JavaScriptCore.pri and WebCore.pri can share.
     9
     10        https://bugs.webkit.org/show_bug.cgi?id=40780
     11
     12        * JavaScriptCore.pri:
     13        * jit/ExecutableAllocator.h:
     14
    1152010-06-17  Darin Adler  <darin@apple.com>
    216
  • trunk/JavaScriptCore/JavaScriptCore.pri

    r59264 r61338  
    11# JavaScriptCore - Qt4 build info
     2
     3include(../common.pri)
     4
    25VPATH += $$PWD
    36!CONFIG(release, debug|release) {
     
    5255DEFINES += BUILDING_QT__ BUILDING_JavaScriptCore BUILDING_WTF
    5356
    54 contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
    55 contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
    56 
    5757wince* {
    5858    INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/ce-compat
  • trunk/JavaScriptCore/jit/ExecutableAllocator.h

    r58167 r61338  
    2727#define ExecutableAllocator_h
    2828
     29#if ENABLE(JIT)
     30
    2931#include <stddef.h> // for ptrdiff_t
    3032#include <limits>
     
    319321#endif // ENABLE(ASSEMBLER)
    320322
     323#endif // ENABLE(JIT)
     324
    321325#endif // !defined(ExecutableAllocator)
  • trunk/WebCore/ChangeLog

    r61337 r61338  
     12010-06-17  Shu Chang  <chang.shu@nokia.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] Fix the link error on symbian with ENABLE_JIT=0.
     6        1. Add "#if ENABLE(JIT)" in the header file;
     7        2. Put feature enable/disable logic to a common.pri so
     8        that both JavaScriptCore.pri and WebCore.pri can share.
     9
     10        https://bugs.webkit.org/show_bug.cgi?id=40780
     11
     12        * WebCore.pri:
     13
    1142010-06-17  Kenneth Russell  <kbr@google.com>
    215
  • trunk/WebCore/WebCore.pri

    r61120 r61338  
     1
     2include(../common.pri)
     3
    14CONFIG(standalone_package) {
    25    isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/generated
Note: See TracChangeset for help on using the changeset viewer.