Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/script/script.pro

    r166 r561  
    33QPRO_PWD   = $$PWD
    44QT         = core
     5DEFINES   += JSC=QTJSC jscyyparse=qtjscyyparse jscyylex=qtjscyylex jscyyerror=qtjscyyerror WTF=QTWTF
    56DEFINES   += QT_BUILD_SCRIPT_LIB
    67DEFINES   += QT_NO_USING_NAMESPACE
     
    1112
    1213include(../qbase.pri)
     14
     15CONFIG += building-libs
     16
     17# FIXME: shared the statically built JavaScriptCore
     18
     19# Fetch the base WebKit directory from the WEBKITDIR environment variable;
     20# fall back to src/3rdparty otherwise
     21WEBKITDIR = $$(WEBKITDIR)
     22isEmpty(WEBKITDIR) {
     23    WEBKITDIR = $$PWD/../3rdparty/javascriptcore
     24    GENERATED_SOURCES_DIR = generated
     25} else {
     26    message(using external WebKit from $$WEBKITDIR)
     27    CONFIG -= QTDIR_build
     28}
     29include($$WEBKITDIR/WebKit.pri)
     30
     31# Disable a few warnings on Windows.
     32# These are in addition to the ones disabled in WebKit.pri
     33win32-msvc*: QMAKE_CXXFLAGS += -wd4396 -wd4099
     34
     35# Windows CE-specific stuff copied from WebCore.pro
     36# ### Should rather be in JavaScriptCore.pri?
     37wince* {
     38    INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/os-wince
     39    INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/os-win32
     40    LIBS += -lmmtimer
     41}
     42
     43include($$WEBKITDIR/JavaScriptCore/JavaScriptCore.pri)
     44
     45INCLUDEPATH += $$WEBKITDIR/JavaScriptCore
     46INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/parser
     47INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/bytecompiler
     48INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/debugger
     49INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/runtime
     50INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/wtf
     51INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/unicode
     52INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/interpreter
     53INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/jit
     54INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/profiler
     55INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/wrec
     56INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/API
     57INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/bytecode
     58INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/assembler
     59INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/generated
     60
     61# This line copied from WebCore.pro
     62DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1 WTF_CHANGES=1
     63
     64DEFINES += NDEBUG
     65
     66solaris-g++:isEqual(QT_ARCH,sparc) {
     67    CONFIG -= separate_debug_info
     68    CONFIG += no_debug_info
     69}
     70
     71# Avoid JSC C API functions being exported.
     72DEFINES += JS_EXPORT="" JS_EXPORTDATA=""
     73
     74INCLUDEPATH += $$PWD
     75
    1376include(script.pri)
     77
     78symbian:TARGET.UID3=0x2001B2E1
Note: See TracChangeset for help on using the changeset viewer.