Show
Ignore:
Timestamp:
08/01/08 14:47:24 (5 months ago)
Author:
sroret
Message:

merge with webkit revision 35510

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/WebCore/WebCore.pro

    r424 r427  
    881881    rendering/SVGRenderTreeAsText.cpp \ 
    882882    rendering/style/RenderStyle.cpp \ 
    883     xml/AccessControlList.cpp \ 
    884     xml/AccessItem.cpp \ 
    885     xml/AccessItemRule.cpp \ 
    886883    xml/DOMParser.cpp \ 
    887884    xml/NativeXPathNSResolver.cpp \ 
    …… 
    10841081        } 
    10851082    } else { 
    1086         INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/ 
    1087         LIBS += -lsqlite3 
     1083        SQLITE3SRCDIR = $$(SQLITE3SRCDIR) 
     1084        isEmpty(SQLITE3SRCDIR) { 
     1085            INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/ 
     1086            LIBS += -lsqlite3 
     1087        } else { 
     1088            CONFIG(release, debug|release):DEFINES *= NDEBUG 
     1089            INCLUDEPATH += $${SQLITE3SRCDIR} 
     1090            SOURCES += $${SQLITE3SRCDIR}/sqlite3.c 
     1091        } 
    10881092    } 
    10891093