Changeset 21235 in webkit


Ignore:
Timestamp:
May 3, 2007 3:04:27 PM (17 years ago)
Author:
hausmann
Message:

Gdk build fixes using the Qt build's qmake tool from Holger Freyther, reviewed by Zack.

Location:
trunk
Files:
1 added
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r21138 r21235  
     12007-05-03  Holger Freyther <freyther@kde.org>
     2
     3        Reviewed by Zack, landed by Simon.
     4        This is bugzilla bug 13499.
     5
     6        * WebKit.pri: Place Qt into a scope, start sharing qmake with the Gdk
     7        port
     8        * WebKit.pro: Place Qt into a scope, start sharing qmake with the Gdk
     9        port
     10
    1112007-04-27  Holger Freyther <freyther@kde.org>
    212
  • trunk/JavaScriptCore/ChangeLog

    r21221 r21235  
     12007-05-03  Holger Freyther <freyther@kde.org>
     2
     3        Reviewed by Zack, landed by Simon.
     4        This is bugzilla bug 13499.
     5
     6        * JavaScriptCore.pri: Place Qt into the qt-port scope
     7        * bindings/testbindings.pro: Place Qt into the qt-port scope
     8        * kjs/testkjs.pro: Place Qt into the qt-port scope
     9        * pcre/pcre.pri: Place Qt into the qt-port scope
     10
    1112007-05-02  David Harrison  <harrison@apple.com>
    212
  • trunk/JavaScriptCore/JavaScriptCore.pri

    r20310 r21235  
    33
    44INCLUDEPATH += tmp
    5 INCLUDEPATH += $$PWD $$PWD/kjs $$PWD/bindings $$PWD/bindings/c $$PWD/bindings/qt $$PWD/wtf
     5INCLUDEPATH += $$PWD $$PWD/kjs $$PWD/bindings $$PWD/bindings/c $$PWD/wtf
    66DEFINES -= KJS_IDENTIFIER_HIDE_GLOBALS
    7 DEFINES += BUILDING_QT__
     7qt-port:INCLUDEPATH += $$PWD/bindings/qt
     8qt-port:DEFINES += BUILDING_QT__
    89
    910include(pcre/pcre.pri)
     
    3940    bindings/c/c_runtime.cpp \
    4041    bindings/c/c_utility.cpp \
    41     bindings/qt/qt_class.cpp \
    42     bindings/qt/qt_instance.cpp \
    43     bindings/qt/qt_runtime.cpp \
    4442    kjs/DateMath.cpp \
    4543    kjs/JSWrapperObject.cpp \
     
    8381    kjs/value.cpp
    8482
     83qt-port:SOURCES += \
     84    bindings/qt/qt_class.cpp \
     85    bindings/qt/qt_instance.cpp \
     86    bindings/qt/qt_runtime.cpp
     87
    8588
    8689# GENERATOR 1-A: LUT creator
  • trunk/JavaScriptCore/bindings/testbindings.pro

    r18339 r21235  
    22
    33include(../../WebKit.pri)
    4 INCLUDEPATH += .. ../kjs . bindings/qt
     4INCLUDEPATH += .. ../kjs .
     5qt-port:INCLUDEPATH += bindings/qt
    56
    67SOURCES += testqtbindings.cpp
  • trunk/JavaScriptCore/kjs/testkjs.pro

    r19251 r21235  
    55QT -= gui
    66DEFINES -= KJS_IDENTIFIER_HIDE_GLOBALS
    7 DEFINES += BUILDING_QT__
    87INCLUDEPATH += $$PWD/.. $$PWD $$PWD/../bindings $$PWD/../bindings/c $$PWD/../wtf
    9 LIBS += -L$$OUTPUT_DIR/lib -lWebKitQt
     8qt-port:DEFINES += BUILDING_QT__
     9qt-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitQt
    1010QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
    1111
  • trunk/JavaScriptCore/pcre/pcre.pri

    r18933 r21235  
    11# Perl Compatible Regular Expressions - Qt4 build info
    22VPATH += $$PWD
    3 INCLUDEPATH += $$PWD
     3INCLUDEPATH += $$PWD $$OUTPUT_DIR/JavaScriptCore/kjs/tmp
    44
    55SOURCES += \
     
    2727# GENERATOR: "chartables.c": compile and execute the chartables generator (and add it to sources)
    2828ctgen.output = tmp/chartables.c
    29 ctgen.commands = gcc ${QMAKE_FILE_NAME} -DBUILDING_QT__ -I$$PWD/../wtf -o tmp/${QMAKE_FILE_BASE} && ./tmp/${QMAKE_FILE_BASE} ${QMAKE_FILE_OUT}
     29ctgen.commands = gcc ${QMAKE_FILE_NAME} -I$$PWD/../wtf -o tmp/${QMAKE_FILE_BASE} && ./tmp/${QMAKE_FILE_BASE} ${QMAKE_FILE_OUT}
     30qt-port:ctgen.commands = gcc ${QMAKE_FILE_NAME} -DBUILDING_QT__ -I$$PWD/../wtf -o tmp/${QMAKE_FILE_BASE} && ./tmp/${QMAKE_FILE_BASE} ${QMAKE_FILE_OUT}
     31gdk-port:ctgen.commands = gcc ${QMAKE_FILE_NAME} -DBUILDING_GDK__ -DBUILDING_CAIRO__ -I$$PWD/../wtf -o tmp/${QMAKE_FILE_BASE} && ./tmp/${QMAKE_FILE_BASE} ${QMAKE_FILE_OUT}
    3032ctgen.input = CTGENFILE
    3133ctgen.CONFIG += target_predeps no_link
  • trunk/WebCore/ChangeLog

    r21233 r21235  
     12007-05-03  Holger Freyther <freyther@kde.org>
     2
     3        Reviewed by Zack, landed by Simon.
     4        This is bugzilla bug 13499.
     5
     6        * WebCore.pro: Place the Qt port into the qt-port scope, add the Gdk port
     7
    182007-05-03  Adele Peterson  <adele@apple.com>
    29
  • trunk/WebCore/WebCore.pro

    r21183 r21235  
    1 # WebCore - Qt4 build info
     1# WebCore - qmake build info
     2include($$PWD/../WebKit.pri)
     3qt-port:LIBS -= -lWebKitQt
     4gdk-port:LIBS -= -lWebKitGdk
    25
    36TEMPLATE = lib
    4 TARGET = WebKitQt
     7qt-port:TARGET = WebKitQt
     8gdk-port:TARGET = WebKitGdk
    59OBJECTS_DIR = tmp
    6 INCLUDEPATH += tmp
    7 
    8 isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD/..
     10INCLUDEPATH += tmp $$OUTPUT_DIR/WebCore/tmp
     11
    912DESTDIR = $$OUTPUT_DIR/lib
    1013
     
    1518#QMAKE_CXXFLAGS += -Wall -Wno-undef -Wno-unused-parameter
    1619
    17 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
     20qt-port:contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
    1821unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
    1922
    2023linux-*: DEFINES += HAVE_STDINT_H
    2124freebsd-*: DEFINES += HAVE_PTHREAD_NP_H
    22 
    23 DEFINES += USE_SYSTEM_MALLOC
    24 
    25 CONFIG(release) {
    26     DEFINES += NDEBUG
    27 }
    2825
    2926# PRE-BUILD: make the required config.h file
     
    4037DEFINES += ENABLE_XSLT=1
    4138#DEFINES += ENABLE_XBL=1
    42 DEFINES += ENABLE_SVG=1
    43 
    44 DEFINES += WTF_CHANGES=1 BUILDING_QT__=1
     39qt-port:DEFINES += ENABLE_SVG=1
     40
     41DEFINES += WTF_CHANGES=1
     42gdk-port:PKGCONFIG += libcurl
     43gdk-port:LIBS += $$system(icu-config --ldflags)
    4544
    4645include($$PWD/../JavaScriptCore/JavaScriptCore.pri)
     
    5453    LIBS += -L/opt/local/lib -lxml2 -lxslt
    5554}
     55qt-port:INCLUDEPATH += \
     56                $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/ \
     57                $$PWD/platform/qt \
     58                $$PWD/platform/network/qt \
     59                $$PWD/platform/graphics/qt \
     60                $$PWD/platform/graphics/svg/qt \
     61                $$PWD/loader/qt \
     62                $$PWD/page/qt \
     63                $$PWD/../WebKitQt/WebCoreSupport \
     64                $$PWD/../WebKitQt/Api
     65
     66gdk-port:INCLUDEPATH += \
     67    $$PWD/platform/image-decoders/bmp \
     68    $$PWD/platform/image-decoders/gif \
     69    $$PWD/platform/image-decoders/ico \
     70    $$PWD/platform/image-decoders/jpeg \
     71    $$PWD/platform/image-decoders/png \
     72    $$PWD/platform/image-decoders/xbm
    5673
    5774INCLUDEPATH +=  $$PWD \
    58                 $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/ \
    5975                $$PWD/ForwardingHeaders \
    6076                $$PWD/../JavaScriptCore/kjs \
    6177                $$PWD/../JavaScriptCore/bindings \
    6278                $$PWD/platform \
    63                 $$PWD/platform/qt \
    6479                $$PWD/platform/network \
    65                 $$PWD/platform/network/qt \
    6680                $$PWD/platform/graphics \
    67                 $$PWD/platform/graphics/qt \
    6881                $$PWD/platform/graphics/svg \
    69                 $$PWD/platform/graphics/svg/qt \
    7082                $$PWD/platform/graphics/svg/filters \
    71                 $$PWD/loader $$PWD/loader/icon $$PWD/loader/qt \
     83                $$PWD/loader $$PWD/loader/icon \
    7284                $$PWD/css \
    7385                $$PWD/dom \
    7486                $$PWD/page \
    75                 $$PWD/page/qt \
    7687                $$PWD/bridge \
    7788                $$PWD/editing \
     
    8394                $$PWD/ksvg2 $$PWD/ksvg2/css $$PWD/ksvg2/svg $$PWD/ksvg2/misc $$PWD/ksvg2/events \
    8495                $$PWD/platform/image-decoders \
    85                 $$PWD/../WebKitQt/WebCoreSupport \
    86                 $$PWD/../WebKitQt/Api
     96                $$PWD/../WebKitQt/WebCoreSupport
    8797QT += network
    8898LIBS += -lsqlite3
     
    91101FEATURE_DEFINES_JAVASCRIPT = LANGUAGE_JAVASCRIPT
    92102
    93 
    94103TOKENIZER = $$PWD/css/tokenizer.flex
    95104
     
    114123STYLESHEETS_EMBED = $$PWD/css/html4.css
    115124
    116 MANUALMOC += \
     125MANUALMOC =
     126qt-port:MANUALMOC += \
    117127    $$PWD/platform/network/qt/ResourceHandleManagerQt.h \
    118128    $$PWD/platform/qt/QWebPopup.h \
     
    373383    editing/ModifySelectionListLevel.cpp \
    374384    editing/MoveSelectionCommand.cpp \
    375     editing/qt/EditorQt.cpp \
    376385    editing/RemoveCSSPropertyCommand.cpp \
    377386    editing/RemoveNodeAttributeCommand.cpp \
     
    395404    history/HistoryItem.cpp \
    396405    history/HistoryItemTimer.cpp \
    397     history/qt/CachedPageQt.cpp \
    398406    html/CanvasGradient.cpp \
    399407    html/CanvasPattern.cpp \
     
    504512    loader/PluginDocument.cpp \
    505513    loader/ProgressTracker.cpp \
    506     loader/qt/DocumentLoaderQt.cpp \
    507514    loader/Request.cpp \
    508515    loader/ResourceLoader.cpp \
     
    521528    page/MouseEventWithHitTestResults.cpp \
    522529    page/Page.cpp \
    523     page/qt/DragControllerQt.cpp \
    524     page/qt/EventHandlerQt.cpp \
    525     page/qt/FrameQt.cpp \
    526530    page/Settings.cpp \
    527531    platform/Arena.cpp \
     
    561565    platform/graphics/PathTraversalState.cpp \
    562566    platform/graphics/Pen.cpp \
    563     platform/graphics/qt/AffineTransformQt.cpp \
    564     platform/graphics/qt/ColorQt.cpp \
    565     platform/graphics/qt/FloatPointQt.cpp \
    566     platform/graphics/qt/FloatRectQt.cpp \
    567     platform/graphics/qt/GraphicsContextQt.cpp \
    568     platform/graphics/qt/IconQt.cpp \
    569     platform/graphics/qt/ImageBufferQt.cpp \
    570     platform/graphics/qt/ImageDecoderQt.cpp \
    571     platform/graphics/qt/ImageQt.cpp \
    572     platform/graphics/qt/ImageSourceQt.cpp \
    573     platform/graphics/qt/IntPointQt.cpp \
    574     platform/graphics/qt/IntRectQt.cpp \
    575     platform/graphics/qt/IntSizeQt.cpp \
    576     platform/graphics/qt/PathQt.cpp \
    577567    platform/KURL.cpp \
    578568    platform/Logging.cpp \
     
    583573    platform/network/HTTPParsers.cpp \
    584574    platform/network/ProtectionSpace.cpp \
    585     platform/network/qt/ResourceHandleManagerQt.cpp \
    586     platform/network/qt/ResourceHandleQt.cpp \
    587575    platform/network/ResourceHandle.cpp \
    588576    platform/network/ResourceRequest.cpp \
    589577    platform/network/ResourceResponse.cpp \
    590     platform/qt/ClipboardQt.cpp \
    591     platform/qt/ContextMenuItemQt.cpp \
    592     platform/qt/ContextMenuQt.cpp \
    593     platform/qt/CookieJarQt.cpp \
    594     platform/qt/CursorQt.cpp \
    595     platform/qt/DragDataQt.cpp \
    596     platform/qt/DragImageQt.cpp \
    597     platform/qt/FileChooserQt.cpp \
    598     platform/qt/FontCacheQt.cpp \
    599     platform/qt/FontDataQt.cpp \
    600     platform/qt/FontPlatformDataQt.cpp \
    601     platform/qt/FontQt.cpp \
    602     platform/qt/GlyphPageTreeNodeQt.cpp \
    603     platform/qt/MimeTypeRegistryQt.cpp \
    604     platform/qt/PasteboardQt.cpp \
    605     platform/qt/PlatformKeyboardEventQt.cpp \
    606     platform/qt/PlatformMouseEventQt.cpp \
    607     platform/qt/PlatformScrollBarQt.cpp \
    608     platform/qt/PopupMenuQt.cpp \
    609     platform/qt/QWebPopup.cpp \
    610     platform/qt/RenderThemeQt.cpp \
    611     platform/qt/ScreenQt.cpp \
    612     platform/qt/ScrollViewQt.cpp \
    613     platform/qt/SearchPopupMenuQt.cpp \
    614     platform/qt/SharedTimerQt.cpp \
    615     platform/qt/SoundQt.cpp \
    616     platform/qt/StringQt.cpp \
    617     platform/qt/SystemTimeQt.cpp \
    618     platform/qt/TemporaryLinkStubs.cpp \
    619     platform/qt/TextBoundaries.cpp \
    620     platform/qt/TextBreakIteratorQt.cpp \
    621     platform/qt/TextCodecQt.cpp \
    622     platform/qt/WheelEventQt.cpp \
    623     platform/qt/WidgetQt.cpp \
    624578    platform/RegularExpression.cpp \
    625579    platform/ScrollBar.cpp \
     
    714668    xml/XSLImportRule.cpp \
    715669    xml/XSLStyleSheet.cpp \
    716     xml/XSLTProcessor.cpp \
     670    xml/XSLTProcessor.cpp
     671
     672qt-port:SOURCES += \
     673    page/qt/DragControllerQt.cpp \
     674    page/qt/EventHandlerQt.cpp \
     675    page/qt/FrameQt.cpp \
     676    loader/qt/DocumentLoaderQt.cpp \
     677    platform/graphics/qt/AffineTransformQt.cpp \
     678    platform/graphics/qt/ColorQt.cpp \
     679    platform/graphics/qt/FloatPointQt.cpp \
     680    platform/graphics/qt/FloatRectQt.cpp \
     681    platform/graphics/qt/GraphicsContextQt.cpp \
     682    platform/graphics/qt/IconQt.cpp \
     683    platform/graphics/qt/ImageBufferQt.cpp \
     684    platform/graphics/qt/ImageDecoderQt.cpp \
     685    platform/graphics/qt/ImageQt.cpp \
     686    platform/graphics/qt/ImageSourceQt.cpp \
     687    platform/graphics/qt/IntPointQt.cpp \
     688    platform/graphics/qt/IntRectQt.cpp \
     689    platform/graphics/qt/IntSizeQt.cpp \
     690    platform/graphics/qt/PathQt.cpp \
     691    platform/network/qt/ResourceHandleManagerQt.cpp \
     692    platform/network/qt/ResourceHandleQt.cpp \
     693    editing/qt/EditorQt.cpp \
     694    history/qt/CachedPageQt.cpp \
     695    platform/qt/ClipboardQt.cpp \
     696    platform/qt/ContextMenuItemQt.cpp \
     697    platform/qt/ContextMenuQt.cpp \
     698    platform/qt/CookieJarQt.cpp \
     699    platform/qt/CursorQt.cpp \
     700    platform/qt/DragDataQt.cpp \
     701    platform/qt/DragImageQt.cpp \
     702    platform/qt/FileChooserQt.cpp \
     703    platform/qt/FontCacheQt.cpp \
     704    platform/qt/FontDataQt.cpp \
     705    platform/qt/FontPlatformDataQt.cpp \
     706    platform/qt/FontQt.cpp \
     707    platform/qt/GlyphPageTreeNodeQt.cpp \
     708    platform/qt/MimeTypeRegistryQt.cpp \
     709    platform/qt/PasteboardQt.cpp \
     710    platform/qt/PlatformKeyboardEventQt.cpp \
     711    platform/qt/PlatformMouseEventQt.cpp \
     712    platform/qt/PlatformScrollBarQt.cpp \
     713    platform/qt/PopupMenuQt.cpp \
     714    platform/qt/QWebPopup.cpp \
     715    platform/qt/RenderThemeQt.cpp \
     716    platform/qt/ScreenQt.cpp \
     717    platform/qt/ScrollViewQt.cpp \
     718    platform/qt/SearchPopupMenuQt.cpp \
     719    platform/qt/SharedTimerQt.cpp \
     720    platform/qt/SoundQt.cpp \
     721    platform/qt/StringQt.cpp \
     722    platform/qt/SystemTimeQt.cpp \
     723    platform/qt/TemporaryLinkStubs.cpp \
     724    platform/qt/TextBoundaries.cpp \
     725    platform/qt/TextBreakIteratorQt.cpp \
     726    platform/qt/TextCodecQt.cpp \
     727    platform/qt/WheelEventQt.cpp \
     728    platform/qt/WidgetQt.cpp \
    717729    ../WebKitQt/WebCoreSupport/ChromeClientQt.cpp \
    718730    ../WebKitQt/WebCoreSupport/ContextMenuClientQt.cpp \
     
    725737    ../WebKitQt/Api/qwebpage.cpp \
    726738    ../WebKitQt/Api/qwebpagehistory.cpp
     739
     740gdk-port:SOURCES += \
     741        platform/TextCodecICU.cpp \
     742        platform/TextBreakIteratorICU.cpp \
     743        page/gdk/EventHandlerGdk.cpp \
     744        page/gdk/ContextMenuClientGdk.cpp \
     745        page/gdk/DragControllerGdk.cpp \
     746        loader/gdk/DocumentLoaderGdk.cpp \
     747        loader/gdk/FrameLoaderClientGdk.cpp \
     748        platform/gdk/CookieJarGdk.cpp \
     749        platform/gdk/CursorGdk.cpp \
     750        platform/gdk/DragDataGdk.cpp \
     751        platform/gdk/DragImageGdk.cpp \
     752        platform/gdk/EditorClientGdk.cpp \
     753        platform/gdk/FontCacheGdk.cpp \
     754        platform/gdk/FontDataGdk.cpp \
     755        platform/gdk/FontGdk.cpp \
     756        platform/gdk/FontPlatformDataGdk.cpp \
     757        platform/gdk/FrameGdk.cpp \
     758        platform/gdk/GlyphPageTreeNodeGdk.cpp \
     759        platform/gdk/KeyEventGdk.cpp \
     760        platform/gdk/MimeTypeRegistryGdk.cpp \
     761        platform/gdk/MouseEventGdk.cpp \
     762        platform/gdk/PopupMenuGdk.cpp \
     763        platform/gdk/RenderThemeGdk.cpp \
     764        platform/gdk/ScrollViewGdk.cpp \
     765        platform/gdk/ScreenGdk.cpp \
     766        platform/gdk/SharedTimerLinux.cpp \
     767        platform/gdk/SystemTimeLinux.cpp \
     768        platform/gdk/TemporaryLinkStubs.cpp \
     769        platform/gdk/WheelEventGdk.cpp \
     770        platform/gdk/WidgetGdk.cpp \
     771        platform/graphics/gdk/ImageGdk.cpp \
     772        platform/network/gdk/ResourceHandleCurl.cpp \
     773        platform/network/gdk/ResourceHandleManager.cpp \
     774        platform/graphics/cairo/AffineTransformCairo.cpp \
     775        platform/graphics/cairo/GraphicsContextCairo.cpp \
     776        platform/graphics/cairo/ImageCairo.cpp \
     777        platform/graphics/cairo/ImageSourceCairo.cpp \
     778        platform/graphics/cairo/PathCairo.cpp \
     779        platform/image-decoders/gif/GIFImageDecoder.cpp \
     780        platform/image-decoders/gif/GIFImageReader.cpp  \
     781        platform/image-decoders/png/PNGImageDecoder.cpp \
     782        platform/image-decoders/png/png.c \
     783        platform/image-decoders/png/pngerror.c \
     784        platform/image-decoders/png/pnggccrd.c \
     785        platform/image-decoders/png/pngget.c \
     786        platform/image-decoders/png/pngmem.c \
     787        platform/image-decoders/png/pngpread.c \
     788        platform/image-decoders/png/pngread.c \
     789        platform/image-decoders/png/pngrio.c \
     790        platform/image-decoders/png/pngrtran.c \
     791        platform/image-decoders/png/pngrutil.c \
     792        platform/image-decoders/png/pngset.c \
     793        platform/image-decoders/png/pngtrans.c \
     794        platform/image-decoders/png/pngvcrd.c \
     795        platform/image-decoders/png/pngwio.c \
     796        platform/image-decoders/png/pngwrite.c \
     797        platform/image-decoders/png/pngwtran.c \
     798        platform/image-decoders/png/pngwutil.c \
     799        platform/image-decoders/jpeg/JPEGImageDecoder.cpp \
     800        platform/image-decoders/jpeg/jcomapi.c \
     801        platform/image-decoders/jpeg/jdapimin.c \
     802        platform/image-decoders/jpeg/jdapistd.c \
     803        platform/image-decoders/jpeg/jdatadst.c \
     804        platform/image-decoders/jpeg/jdatasrc.c \
     805        platform/image-decoders/jpeg/jdcoefct.c \
     806        platform/image-decoders/jpeg/jdcolor.c \
     807        platform/image-decoders/jpeg/jddctmgr.c \
     808        platform/image-decoders/jpeg/jdhuff.c \
     809        platform/image-decoders/jpeg/jdinput.c \
     810        platform/image-decoders/jpeg/jdmainct.c \
     811        platform/image-decoders/jpeg/jdmarker.c \
     812        platform/image-decoders/jpeg/jdmaster.c \
     813        platform/image-decoders/jpeg/jdmerge.c \
     814        platform/image-decoders/jpeg/jdphuff.c \
     815        platform/image-decoders/jpeg/jdpostct.c \
     816        platform/image-decoders/jpeg/jdsample.c \
     817        platform/image-decoders/jpeg/jerror.c \
     818        platform/image-decoders/jpeg/jfdctflt.c \
     819        platform/image-decoders/jpeg/jfdctfst.c \
     820        platform/image-decoders/jpeg/jfdctint.c \
     821        platform/image-decoders/jpeg/jidctflt.c \
     822        platform/image-decoders/jpeg/jidctfst.c \
     823        platform/image-decoders/jpeg/jidctint.c \
     824        platform/image-decoders/jpeg/jmemmgr.c \
     825        platform/image-decoders/jpeg/jmemnobs.c \
     826        platform/image-decoders/jpeg/jquant1.c \
     827        platform/image-decoders/jpeg/jquant2.c \
     828        platform/image-decoders/jpeg/jutils.c \
     829        platform/image-decoders/bmp/BMPImageDecoder.cpp \
     830        platform/image-decoders/ico/ICOImageDecoder.cpp \
     831        platform/image-decoders/xbm/XBMImageDecoder.cpp
     832 
    727833
    728834contains(DEFINES, ENABLE_XPATH=1) {
     
    10251131        platform/graphics/svg/filters/SVGFilterEffect.cpp \
    10261132        platform/graphics/svg/filters/SVGLightSource.cpp \
    1027         platform/graphics/svg/qt/RenderPathQt.cpp \
    1028         platform/graphics/svg/qt/SVGPaintServerGradientQt.cpp \
    1029         platform/graphics/svg/qt/SVGPaintServerLinearGradientQt.cpp \
    1030         platform/graphics/svg/qt/SVGPaintServerPatternQt.cpp \
    1031         platform/graphics/svg/qt/SVGPaintServerQt.cpp \
    1032         platform/graphics/svg/qt/SVGPaintServerRadialGradientQt.cpp \
    1033         platform/graphics/svg/qt/SVGPaintServerSolidQt.cpp \
    1034         platform/graphics/svg/qt/SVGResourceClipperQt.cpp \
    1035         platform/graphics/svg/qt/SVGResourceFilterQt.cpp \
    1036         platform/graphics/svg/qt/SVGResourceMaskerQt.cpp \
    10371133        platform/graphics/svg/SVGImage.cpp \
    10381134        platform/graphics/svg/SVGPaintServer.cpp \
     
    10621158        rendering/SVGRootInlineBox.cpp
    10631159
     1160qt-port:SOURCES += \
     1161        platform/graphics/svg/qt/RenderPathQt.cpp \
     1162        platform/graphics/svg/qt/SVGPaintServerGradientQt.cpp \
     1163        platform/graphics/svg/qt/SVGPaintServerLinearGradientQt.cpp \
     1164        platform/graphics/svg/qt/SVGPaintServerPatternQt.cpp \
     1165        platform/graphics/svg/qt/SVGPaintServerQt.cpp \
     1166        platform/graphics/svg/qt/SVGPaintServerRadialGradientQt.cpp \
     1167        platform/graphics/svg/qt/SVGPaintServerSolidQt.cpp \
     1168        platform/graphics/svg/qt/SVGResourceClipperQt.cpp \
     1169        platform/graphics/svg/qt/SVGResourceFilterQt.cpp \
     1170        platform/graphics/svg/qt/SVGResourceMaskerQt.cpp
     1171
    10641172        # GENERATOR 5-C:
    10651173        svgnames_a.output = tmp/SVGNames.cpp
  • trunk/WebKit.pri

    r19251 r21235  
    11# Include file to make it easy to include WebKit into Qt projects
    22
    3 INCLUDEPATH += $$PWD/WebKitQt/Api
    4 
    5 DEFINES += BUILDING_QT__=1
    63
    74isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD/WebKitBuild/Release
    85
    9 LIBS += -L$$OUTPUT_DIR/lib -lWebKitQt
     6!gdk-port:CONFIG += qt-port
     7qt-port:DEFINES += BUILDING_QT__=1
     8qt-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitQt
     9gdk-port:CONFIG += link_pkgconfig
     10gdk-port:PKGCONFIG += cairo gdk-2.0 gtk+-2.0
     11gdk-port:DEFINES += BUILDING_GDK__=1 BUILDING_CAIRO__
     12gdk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGdk
     13
     14DEFINES += USE_SYSTEM_MALLOC
     15CONFIG(release) {
     16    DEFINES += NDEBUG
     17}
     18
     19BASE_DIR = $$PWD
     20qt-port:INCLUDEPATH += \
     21    $$PWD/WebKitQt/Api
     22gdk-port:INCLUDEPATH += \
     23    $$BASE_DIR/WebCore/platform/gdk \
     24    $$BASE_DIR/WebCore/platform/network/gdk \
     25    $$BASE_DIR/WebCore/platform/graphics/cairo \
     26    $$BASE_DIR/WebCore/loader/gdk \
     27    $$BASE_DIR/WebCore/page/gdk
     28INCLUDEPATH += \
     29    $$BASE_DIR/JavaScriptCore/ \
     30    $$BASE_DIR/JavaScriptCore/kjs \
     31    $$BASE_DIR/JavaScriptCore/bindings \
     32    $$BASE_DIR/JavaScriptCore/bindings/c \
     33    $$BASE_DIR/JavaScriptCore/wtf \
     34    $$BASE_DIR/WebCore \
     35    $$BASE_DIR/WebCore/ForwardingHeaders \
     36    $$BASE_DIR/WebCore/platform \
     37    $$BASE_DIR/WebCore/platform/network \
     38    $$BASE_DIR/WebCore/platform/graphics \
     39    $$BASE_DIR/WebCore/loader \
     40    $$BASE_DIR/WebCore/page \
     41    $$BASE_DIR/WebCore/css \
     42    $$BASE_DIR/WebCore/dom \
     43    $$BASE_DIR/WebCore/bridge \
     44    $$BASE_DIR/WebCore/editing \
     45    $$BASE_DIR/WebCore/rendering \
     46    $$BASE_DIR/WebCore/history \
     47    $$BASE_DIR/WebCore/xml \
     48    $$BASE_DIR/WebCore/html
     49
    1050
    1151macx {
  • trunk/WebKit.pro

    r19251 r21235  
    11TEMPLATE = subdirs
    22CONFIG += ordered
     3!gdk-port:CONFIG += qt-port
    34SUBDIRS = \
    4         WebCore \
     5        WebCore
     6
     7qt-port:SUBDIRS += \
    58        WebKitQt/QtLauncher \
    69        WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro \
    710        JavaScriptCore/kjs/testkjs.pro
     11gdk-port:SUBDIRS += \
     12        WebKitTools/GdkLauncher
  • trunk/WebKitTools/ChangeLog

    r21228 r21235  
     12007-05-03  Holger Freyther <freyther@kde.org>
     2
     3        Reviewed by Zack, landed by Simon.
     4        This is bugzilla bug 13499.
     5
     6        * GdkLauncher/GdkLauncher.pro: Build the GdkLauncher using qmake
     7        * GdkLauncher/main.cpp: We don't have a config.h with the qmake build
     8        * Scripts/build-webkit: Add --gdk for the Gdk port
     9        * Scripts/webkitdirs.pm: Add helper methods for the Gdk port
     10
    1112007-05-03  Geoffrey Garen  <ggaren@apple.com>
    212
  • trunk/WebKitTools/GdkLauncher/main.cpp

    r21148 r21235  
     1#ifdef HAVE_CONFIG_H
    12#include "config.h"
     3#endif
     4#include "Platform.h"
    25#include "ChromeClientGdk.h"
    36#include "ContextMenuClientGdk.h"
  • trunk/WebKitTools/Scripts/build-webkit

    r21220 r21235  
    101101    chdir $dir or die;
    102102    my $result = 0;
    103     if (isQt()) {
     103    if (isGdk()) {
     104        if ($dir ne "WebKit") {
     105            chdir ".." or die;
     106            next;
     107        }
     108
     109        $result = buildQMakeGdkProject($dir, $colorSupport);
     110    } elsif (isQt()) {
    104111        if ($dir ne "WebKit") {
    105112            chdir ".." or die;
  • trunk/WebKitTools/Scripts/webkitdirs.pm

    r21220 r21235  
    275275    my $framework = shift;
    276276    determineConfigurationProductDir();
    277     if (isQt()) {
     277    if (isQt() or isGdk()) {
    278278        return "$configurationProductDir/$framework";
    279279    }
     
    309309    my $path = shift;
    310310
    311     if ((isQt()) and ($path =~ /WebCore/)) {
     311    if (isQt() and $path =~ /WebCore/) {
    312312        $path .= "/../lib/libWebKitQt.so";
     313    }
     314
     315    if (isGdk() and $path =~ /WebCore/) {
     316        $path .= "/../lib/libWebKitGdk.so";
    313317    }
    314318
     
    349353{
    350354    return defined($ENV{'QTDIR'})
     355}
     356
     357sub isGdk()
     358{
     359    for my $i (0 .. $#ARGV) {
     360        my $opt = $ARGV[$i];
     361        if ($opt =~ /^--gdk$/i ) {
     362            return 1;
     363        }
     364    }
     365    return 0;
    351366}
    352367
     
    448463    my @buildArgs = ("-r");
    449464    push @buildArgs, "OUTPUT_DIR=" . baseProductDir() . "/$config";
     465    push @buildArgs, "CONFIG+=qt-port";
    450466    push @buildArgs, sourceDir() . "/WebKit.pro";
    451467
     
    472488}
    473489
     490sub buildQMakeGdkProject($$)
     491{
     492    my ($project, $colorize) = @_;
     493
     494    if ($project ne "WebKit") {
     495        die "The Gdk portbuilds JavaScriptCore/WebCore/WebKitQt in one shot! Only call it for 'WebKit'.\n";
     496    }
     497
     498    my $config = configuration();
     499    my $prefix = $ENV{"WebKitInstallationPrefix"};
     500
     501    my @buildArgs = ("-r");
     502    push @buildArgs, "OUTPUT_DIR=" . baseProductDir() . "/$config";
     503    push @buildArgs, "CONFIG-=qt";
     504    push @buildArgs, "CONFIG+=gdk-port";
     505    push @buildArgs, sourceDir() . "/WebKit.pro";
     506
     507    print "Calling 'qmake @buildArgs' in " . baseProductDir() . "/$config ...\n\n";
     508    print "Installation directory: $prefix\n" if(defined($prefix));
     509
     510    system "mkdir -p " . baseProductDir() . "/$config";
     511    chdir baseProductDir() . "/$config" or die "Failed to cd into " . baseProductDir() . "/$config \n";
     512
     513    my $result = system "qmake-qt4", @buildArgs;
     514    $result =  system "qmake", @buildArgs if ($result ne 0);
     515    if ($result ne 0) {
     516       die "Failed to setup build environment using qmake!\n";
     517    }
     518
     519    my $clean = $ENV{"WEBKIT_FULLBUILD"};
     520
     521    if (defined $clean) {
     522      system "make clean";
     523    }
     524
     525    $result = system "make";
     526    chdir ".." or die;
     527    return $result;
     528}
     529
    4745301;
Note: See TracChangeset for help on using the changeset viewer.