Changeset 33518 in webkit


Ignore:
Timestamp:
May 16, 2008, 7:25:57 AM (17 years ago)
Author:
Simon Hausmann
Message:

2008-05-15 Ariya Hidayat <​[email protected]>

Reviewed by Simon.

Since WebKitGtk is fully using autotools now, clean-up the .pro/.pri files
from gtk-port.

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r33020 r33518  
     12008-05-15  Ariya Hidayat  <[email protected]>
     2
     3        Reviewed by Simon.
     4
     5        Since WebKitGtk is fully using autotools now, clean-up the .pro/.pri files
     6        from gtk-port.
     7
     8        * WebKit.pri:
     9        * WebKit.pro:
     10
    1112008-05-09  Anders Carlsson  <[email protected]>
    212

  • trunk/JavaScriptCore/ChangeLog

    r33511 r33518  
     12008-05-15  Ariya Hidayat  <[email protected]>
     2
     3        Reviewed by Simon.
     4
     5        Since WebKitGtk is fully using autotools now, clean-up the .pro/.pri files
     6        from gtk-port.
     7
     8        * JavaScriptCore.pro:
     9        * kjs/testkjs.pro:
     10
    1112008-05-15  Kevin McCullough  <[email protected]>
    212

  • trunk/JavaScriptCore/JavaScriptCore.pri

    r33466 r33518  
    66DEPENDPATH += $$PWD $$PWD/kjs $$PWD/wtf $$PWD/wtf/unicode
    77DEFINES -= KJS_IDENTIFIER_HIDE_GLOBALS
    8 qt-port:DEFINES += BUILDING_QT__
    9 gtk-port:DEFINES += BUILDING_GTK__
    10 
    11 # http://bugs.webkit.org/show_bug.cgi?id=16406
    12 # [Gtk] JavaScriptCore needs -lpthread
    13 gtk-port:!win32-*:LIBS += -lpthread
     8DEFINES += BUILDING_QT__
    149
    1510win32-msvc*: INCLUDEPATH += $$PWD/os-win32
    … …  
    5550# AllInOneFile.cpp helps gcc analize and optimize code
    5651# Other compilers may be able to do this at link time
    57 gtk-port:CONFIG(release) {
    58 SOURCES += \
    59     kjs/AllInOneFile.cpp
    60 } else {
    6152SOURCES += \
    6253    kjs/function.cpp \
    … …  
    10293    profiler/Profile.cpp \
    10394    profiler/Profiler.cpp \
    104     wtf/FastMalloc.cpp
    105 
    106 !qt-port:SOURCES += \
    107     wtf/TCSystemAlloc.cpp
    108 }
    109 
    110 gtk-port:SOURCES += \
    111     wtf/ThreadingGtk.cpp \
    112     wtf/gtk/MainThreadGtk.cpp
    113 
    114 !gtk-port:SOURCES += \
     95    wtf/FastMalloc.cpp \
    11596    wtf/ThreadingQt.cpp \
    11697    wtf/qt/MainThreadQt.cpp

  • trunk/JavaScriptCore/kjs/testkjs.pro

    r32306 r33518  
    77INCLUDEPATH += $$PWD/.. $$PWD $$PWD/../bindings $$PWD/../bindings/c $$PWD/../wtf
    88CONFIG -= app_bundle
    9 qt-port:DEFINES += BUILDING_QT__
    10 #qt-port:LIBS += -L$$OUTPUT_DIR/lib -lQtWebKit
     9DEFINES += BUILDING_QT__
    1110
    1211CONFIG += link_pkgconfig
    13 gtk-port:PKGCONFIG += glib-2.0 gobject-2.0 gthread-2.0
    1412
    15 gtk-port {
    16     QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
    17     LIBS += $$system(icu-config --ldflags)
    18 }
    1913QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
    2014
    … …  
    3731    API/JSValueRef.cpp
    3832
    39 qt-port:lessThan(QT_MINOR_VERSION, 4) {
     33lessThan(QT_MINOR_VERSION, 4) {
    4034    DEFINES += QT_BEGIN_NAMESPACE="" QT_END_NAMESPACE=""
    4135}

  • trunk/WebCore/ChangeLog

    r33515 r33518  
     12008-05-15  Ariya Hidayat  <[email protected]>
     2
     3        Reviewed by Simon.
     4
     5        Since WebKitGtk is fully using autotools now, clean-up the .pro/.pri files
     6        from gtk-port.
     7
     8        * WebCore.pro:
     9
    1102008-05-16  Simon Hausmann  <[email protected]>
    211

  • trunk/WebCore/WebCore.pro

    r33514 r33518  
    66CONFIG += no_batch
    77include($$PWD/../WebKit.pri)
    8 gtk-port:LIBS -= -lWebKitGtk
    98
    109TEMPLATE = lib
    11 qt-port:TARGET = QtWebKit
    12 gtk-port:TARGET = WebKitGtk
     10TARGET = QtWebKit
    1311
    1412CONFIG(QTDIR_build) {
    … …  
    6765}
    6866
    69 gtk-port: PKGCONFIG += gthread-2.0
    70 
    7167# Optional components (look for defs in config.h and included files!)
    7268!contains(DEFINES, ENABLE_CROSS_DOCUMENT_MESSAGING=.): DEFINES += ENABLE_CROSS_DOCUMENT_MESSAGING=1
    … …  
    7571!contains(DEFINES, ENABLE_ICONDATABASE=.): DEFINES += ENABLE_ICONDATABASE=1
    7672!contains(DEFINES, ENABLE_XPATH=.): DEFINES += ENABLE_XPATH=1
    77 gtk-port:!contains(DEFINES, ENABLE_XSLT=.): DEFINES += ENABLE_XSLT=1
    7873#!contains(DEFINES, ENABLE_XBL=.): DEFINES += ENABLE_XBL=1
    79 qt-port: !contains(DEFINES, ENABLE_SVG=.): DEFINES += ENABLE_SVG=1
    80 qt-port: !contains(DEFINES, ENABLE_SVG_FOREIGN_OBJECT=.): DEFINES += ENABLE_SVG_FOREIGN_OBJECT=1
    81 qt-port: !contains(DEFINES, ENABLE_SVG_ANIMATION=.): DEFINES += ENABLE_SVG_ANIMATION=1
    82 #qt-port: !contains(DEFINES, ENABLE_SVG_AS_IMAGE=.): DEFINES += ENABLE_SVG_AS_IMAGE=1
    83 qt-port: !contains(DEFINES, ENABLE_SVG_USE=.): DEFINES += ENABLE_SVG_USE=1
    84 gtk-port:DEFINES += ENABLE_SVG=0
    85 qt-port:contains(QT_CONFIG, phonon):DEFINES += ENABLE_VIDEO=1
     74!contains(DEFINES, ENABLE_SVG=.): DEFINES += ENABLE_SVG=1
     75!contains(DEFINES, ENABLE_SVG_FOREIGN_OBJECT=.): DEFINES += ENABLE_SVG_FOREIGN_OBJECT=1
     76!contains(DEFINES, ENABLE_SVG_ANIMATION=.): DEFINES += ENABLE_SVG_ANIMATION=1
     77#!contains(DEFINES, ENABLE_SVG_AS_IMAGE=.): DEFINES += ENABLE_SVG_AS_IMAGE=1
     78!contains(DEFINES, ENABLE_SVG_USE=.): DEFINES += ENABLE_SVG_USE=1
     79contains(QT_CONFIG, phonon):DEFINES += ENABLE_VIDEO=1
    8680else:DEFINES += ENABLE_VIDEO=0
    87 qt-port:unix:!mac:!embedded: DEFINES += XP_UNIX ENABLE_NETSCAPE_PLUGIN_API=1
    88 gtk-port:x11:plugins: DEFINES += XP_UNIX ENABLE_NETSCAPE_PLUGIN_API=1
    89 qt-port: DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1
     81unix:!mac:!embedded: DEFINES += XP_UNIX ENABLE_NETSCAPE_PLUGIN_API=1
     82DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1
    9083
    9184DEFINES += WTF_CHANGES=1
    … …  
    128121#LIBS += -L$$OUTPUT_DIR/lib -lJavaScriptCore
    129122
    130 qt-port {
    131     RESOURCES += \
    132         $$PWD/../WebCore/page/inspector/WebKit.qrc \
    133         $$PWD/../WebCore/Resources/WebKitResources.qrc
    134     INCLUDEPATH += \
    135         $$PWD/platform/qt \
    136         $$PWD/platform/network/qt \
    137         $$PWD/platform/graphics/qt \
    138         $$PWD/svg/graphics/qt \
    139         $$PWD/loader/qt \
    140         $$PWD/page/qt \
    141         $$PWD/../WebKit/qt/WebCoreSupport \
    142         $$PWD/../WebKit/qt/Api \
    143         $$PWD/bridge/qt
    144 
    145     DEPENDPATH += editing/qt history/qt loader/qt page/qt \
    146         platform/graphics/qt ../WebKit/qt/Api ../WebKit/qt/WebCoreSupport
    147 
    148 }
    149 
    150 gtk-port {
    151     hildon {
    152         DEFINES += MAEMO_CHANGES
    153         PKGCONFIG += hildon-1
    154     }
    155 
    156     INCLUDEPATH += \
    157     $$PWD/platform/gtk \
    158     $$PWD/platform/graphics/gtk \
    159     $$PWD/platform/graphics/cairo \
    160     $$PWD/svg/graphics/cairo \
    161     $$PWD/platform/network/curl \
    162     $$PWD/platform/image-decoders \
    163     $$PWD/platform/image-decoders/bmp \
    164     $$PWD/platform/image-decoders/gif \
    165     $$PWD/platform/image-decoders/ico \
    166     $$PWD/platform/image-decoders/jpeg \
    167     $$PWD/platform/image-decoders/png \
    168     $$PWD/platform/image-decoders/xbm \
    169     $$PWD/loader/gtk \
    170     $$PWD/page/gtk \
    171     $$PWD/../WebKit/gtk \
    172     $$PWD/../WebKit/gtk/WebCoreSupport \
    173     $$PWD/../WebKit/gtk/webkit
    174 
    175     DEPENDPATH += \
    176     platform/gtk \
    177     platform/graphics/gtk \
    178     platform/graphics/cairo \
    179     svg/graphics/cairo \
    180     platform/network/curl \
    181     platform/image-decoders \
    182     platform/image-decoders/bmp \
    183     platform/image-decoders/gif \
    184     platform/image-decoders/ico \
    185     platform/image-decoders/jpeg \
    186     platform/image-decoders/png \
    187     platform/image-decoders/xbm \
    188     loader/gtk \
    189     page/gtk \
    190     ../WebKit/gtk \
    191     ../WebKit/gtk/WebCoreSupport \
    192     ../WebKit/gtk/webkit
    193 }
     123RESOURCES += \
     124    $$PWD/../WebCore/page/inspector/WebKit.qrc \
     125    $$PWD/../WebCore/Resources/WebKitResources.qrc
     126INCLUDEPATH += \
     127    $$PWD/platform/qt \
     128    $$PWD/platform/network/qt \
     129    $$PWD/platform/graphics/qt \
     130    $$PWD/svg/graphics/qt \
     131    $$PWD/loader/qt \
     132    $$PWD/page/qt \
     133    $$PWD/../WebKit/qt/WebCoreSupport \
     134    $$PWD/../WebKit/qt/Api \
     135    $$PWD/bridge/qt
     136
     137DEPENDPATH += editing/qt history/qt loader/qt page/qt \
     138    platform/graphics/qt ../WebKit/qt/Api ../WebKit/qt/WebCoreSupport
    194139
    195140# Make sure storage/ appears before JavaScriptCore/kjs. Both provide LocalStorage.h
    … …  
    964909    xml/XSLTProcessor.cpp
    965910
    966 gtk-port {
    967   SOURCES += \
    968     platform/graphics/GlyphPageTreeNode.cpp \
    969     platform/graphics/GlyphWidthMap.cpp \
    970     platform/graphics/FontCache.cpp \
    971     platform/graphics/Font.cpp \
    972     platform/graphics/FontFallbackList.cpp \
    973     platform/graphics/SimpleFontData.cpp
    974 }
    975 
    976 qt-port {
    977 
    978     HEADERS += \
     911HEADERS += \
    979912    $$PWD/platform/graphics/qt/StillImageQt.h \
    980913    $$PWD/platform/qt/QWebPopup.h \
    … …  
    989922    $$PWD/platform/network/qt/QNetworkReplyHandler.h
    990923
    991     SOURCES += \
     924SOURCES += \
    992925    bridge/qt/qt_class.cpp \
    993926    bridge/qt/qt_instance.cpp \
    … …  
    10861019        DEFINES += QT_BEGIN_NAMESPACE="" QT_END_NAMESPACE=""
    10871020     }
    1088 }
    1089 
    1090 gtk-port {
    1091     HEADERS += \
    1092         ../WebCore/platform/gtk/ClipboardGtk.h \
    1093         ../WebCore/platform/gtk/PasteboardHelper.h \
    1094         ../WebKit/gtk/webkit/webkit.h \
    1095         ../WebKit/gtk/webkit/webkitdefines.h \
    1096         ../WebKit/gtk/webkit/webkitnetworkrequest.h \
    1097         ../WebKit/gtk/webkit/webkitprivate.h \
    1098         ../WebKit/gtk/webkit/webkitwebbackforwardlist.h \
    1099         ../WebKit/gtk/webkit/webkitwebframe.h \
    1100         ../WebKit/gtk/webkit/webkitwebhistoryitem.h \
    1101         ../WebKit/gtk/webkit/webkitwebsettings.h \
    1102         ../WebKit/gtk/webkit/webkitwebview.h \
    1103         ../WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
    1104         ../WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \
    1105         ../WebKit/gtk/WebCoreSupport/DragClientGtk.h \
    1106         ../WebKit/gtk/WebCoreSupport/EditorClientGtk.h \
    1107         ../WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \
    1108         ../WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \
    1109         ../WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h
    1110     SOURCES += \
    1111         platform/graphics/StringTruncator.cpp \
    1112         platform/text/TextCodecICU.cpp \
    1113         platform/text/TextBoundariesICU.cpp \
    1114         platform/text/TextBreakIteratorICU.cpp \
    1115         page/gtk/EventHandlerGtk.cpp \
    1116         page/gtk/FrameGtk.cpp \
    1117         page/gtk/DragControllerGtk.cpp \
    1118         platform/gtk/ClipboardGtk.cpp \
    1119         platform/gtk/CookieJarGtk.cpp \
    1120         platform/gtk/CursorGtk.cpp \
    1121         platform/gtk/ContextMenuGtk.cpp \
    1122         platform/gtk/ContextMenuItemGtk.cpp \
    1123         platform/gtk/DragDataGtk.cpp \
    1124         platform/gtk/DragImageGtk.cpp \
    1125         platform/gtk/FileChooserGtk.cpp \
    1126         platform/gtk/FileSystemGtk.cpp \
    1127         platform/graphics/gtk/FontCacheGtk.cpp \
    1128         platform/graphics/gtk/FontCustomPlatformData.cpp \
    1129         platform/graphics/gtk/FontGtk.cpp \
    1130         platform/graphics/gtk/FontPlatformDataGtk.cpp \
    1131         platform/graphics/gtk/GlyphPageTreeNodeGtk.cpp \
    1132         platform/graphics/gtk/SimpleFontDataGtk.cpp \
    1133         platform/gtk/KeyEventGtk.cpp \
    1134         platform/gtk/Language.cpp \
    1135         platform/gtk/LocalizedStringsGtk.cpp \
    1136         platform/gtk/LoggingGtk.cpp \
    1137         platform/gtk/MIMETypeRegistryGtk.cpp \
    1138         platform/gtk/MouseEventGtk.cpp \
    1139         platform/gtk/PasteboardGtk.cpp \
    1140         platform/gtk/PlatformScreenGtk.cpp \
    1141         platform/gtk/PlatformScrollBarGtk.cpp \
    1142         platform/gtk/PopupMenuGtk.cpp \
    1143         platform/gtk/RenderThemeGtk.cpp \
    1144         platform/gtk/SearchPopupMenuGtk.cpp \
    1145         platform/gtk/ScrollViewGtk.cpp \
    1146         platform/gtk/SharedTimerGtk.cpp \
    1147         platform/gtk/SoundGtk.cpp \
    1148         platform/gtk/SystemTimeGtk.cpp \
    1149         platform/gtk/TemporaryLinkStubs.cpp \
    1150         platform/text/gtk/TextBreakIteratorInternalICUGtk.cpp \
    1151         platform/gtk/WheelEventGtk.cpp \
    1152         platform/gtk/WidgetGtk.cpp \
    1153         platform/gtk/gtk2drawing.c \
    1154         platform/graphics/gtk/ColorGtk.cpp \
    1155         platform/graphics/gtk/IconGtk.cpp \
    1156         platform/graphics/gtk/ImageGtk.cpp \
    1157         platform/graphics/gtk/IntPointGtk.cpp \
    1158         platform/graphics/gtk/IntRectGtk.cpp \
    1159         platform/network/curl/ResourceHandleCurl.cpp \
    1160         platform/network/curl/ResourceHandleManager.cpp \
    1161         platform/graphics/cairo/AffineTransformCairo.cpp \
    1162         platform/graphics/cairo/FontCairo.cpp \
    1163         platform/graphics/cairo/GraphicsContextCairo.cpp \
    1164         platform/graphics/cairo/ImageBufferCairo.cpp \
    1165         platform/graphics/cairo/ImageCairo.cpp \
    1166         platform/graphics/cairo/ImageSourceCairo.cpp \
    1167         platform/graphics/cairo/PathCairo.cpp \
    1168         platform/image-decoders/gif/GIFImageDecoder.cpp \
    1169         platform/image-decoders/gif/GIFImageReader.cpp  \
    1170         platform/image-decoders/png/PNGImageDecoder.cpp \
    1171         platform/image-decoders/jpeg/JPEGImageDecoder.cpp \
    1172         platform/image-decoders/bmp/BMPImageDecoder.cpp \
    1173         platform/image-decoders/ico/ICOImageDecoder.cpp \
    1174         platform/image-decoders/xbm/XBMImageDecoder.cpp \
    1175         ../WebKit/gtk/webkit/webkitnetworkrequest.cpp \
    1176         ../WebKit/gtk/webkit/webkitprivate.cpp \
    1177         ../WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
    1178         ../WebKit/gtk/webkit/webkitwebframe.cpp \
    1179         ../WebKit/gtk/webkit/webkitwebhistoryitem.cpp \
    1180         ../WebKit/gtk/webkit/webkitwebsettings.cpp \
    1181         ../WebKit/gtk/webkit/webkitwebview.cpp \
    1182         ../WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
    1183         ../WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
    1184         ../WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \
    1185         ../WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \
    1186         ../WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \
    1187         ../WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \
    1188         ../WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp
    1189 }
    1190 
    11911021
    11921022contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {
    1193     qt-port {
    11941023        unix:!mac {
    11951024            SOURCES += \
    … …  
    11971026                plugins/qt/PluginDatabaseQt.cpp \
    11981027                plugins/qt/PluginViewQt.cpp
    1199         }
    12001028    }
    12011029
    1202     gtk-port {
    1203         INCLUDEPATH += ../WebCore/plugins/gtk
    1204     }
    12051030}
    12061031
    … …  
    12331058        }
    12341059    } else {
    1235         qt-port: INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/
     1060        INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/
    12361061        LIBS += -lsqlite3
    12371062    }
    … …  
    13321157        bindings/js/JSAudioConstructor.cpp
    13331158
    1334     qt-port {
    13351159        HEADERS += \
    13361160            platform/graphics/qt/MediaPlayerPrivatePhonon.h
    … …  
    13491173            INCLUDEPATH += $$QMAKE_LIBDIR_QT/phonon.framework/Headers
    13501174        }
    1351     }
    1352 
    1353     gtk-port {
    1354         SOURCES += \
    1355             platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp \
    1356             platform/graphics/gtk/VideoSinkGStreamer.cpp
    1357 
    1358         CONFIG(debug):DEFINES += GST_DISABLE_DEPRECATED
    1359 
    1360         PKGCONFIG += gstreamer-0.10 gstreamer-plugins-base-0.10 gnome-vfs-2.0
    1361         LIBS += -lgstinterfaces-0.10 -lgstbase-0.10 -lgstvideo-0.10
    1362     }
     1175
    13631176}
    13641177
    … …  
    14001213
    14011214    DEPENDPATH += svg svg/graphics
    1402     qt-port {
    14031215    DEPENDPATH += svg/graphics/qt
    1404     }
    1405 
    1406     gtk-port {
    1407     DEPENDPATH += svg/graphics/cairo
    1408     }
    14091216
    14101217    SVG_NAMES = $$PWD/svg/svgtags.in
    … …  
    17471554        rendering/SVGRootInlineBox.cpp
    17481555
    1749 qt-port:SOURCES += \
     1556SOURCES += \
    17501557        svg/graphics/qt/RenderPathQt.cpp \
    17511558        svg/graphics/qt/SVGPaintServerGradientQt.cpp \
    … …  
    17591566        svg/graphics/qt/SVGResourceMaskerQt.cpp
    17601567
    1761 gtk-port:SOURCES += \
    1762         svg/graphics/cairo/RenderPathCairo.cpp \
    1763         svg/graphics/cairo/SVGPaintServerCairo.cpp \
    1764         svg/graphics/cairo/SVGPaintServerGradientCairo.cpp \
    1765         svg/graphics/cairo/SVGPaintServerPatternCairo.cpp \
    1766         svg/graphics/cairo/SVGPaintServerSolidCairo.cpp \
    1767         svg/graphics/cairo/SVGResourceClipperCairo.cpp \
    1768         svg/graphics/cairo/SVGResourceMaskerCairo.cpp
    17691568
    17701569        # GENERATOR 5-C:
    … …  
    19471746addExtraCompiler(xpathbison)
    19481747
    1949 qt-port:!CONFIG(QTDIR_build) {
     1748!CONFIG(QTDIR_build) {
    19501749    target.path = $$[QT_INSTALL_LIBS]
    19511750    include($$PWD/../WebKit/qt/Api/headers.pri)
    … …  
    19791778}
    19801779
    1981 gtk-port {
    1982     isEmpty(WEBKIT_LIB_DIR):WEBKIT_LIB_DIR=/usr/local/lib
    1983     isEmpty(WEBKIT_INC_DIR):WEBKIT_INC_DIR=/usr/local/include/WebKitGtk
    1984 
    1985     target.path = $$WEBKIT_LIB_DIR
    1986     INSTALLS += target
    1987 
    1988     include($$PWD/../WebKit/gtk/webkit/headers.pri)
    1989     headers.files = $$WEBKIT_API_HEADERS
    1990     headers.path = $$WEBKIT_INC_DIR
    1991     INSTALLS += headers
    1992 
    1993     include($$PWD/../JavaScriptCore/headers.pri)
    1994     jsheaders.files = $$JS_API_HEADERS
    1995     jsheaders.path = $$WEBKIT_INC_DIR/JavaScriptCore
    1996     INSTALLS += jsheaders
    1997 
    1998     unix {
    1999         CONFIG += create_pc create_prl
    2000         QMAKE_PKGCONFIG_LIBDIR = $$target.path
    2001         QMAKE_PKGCONFIG_INCDIR = $$headers.path
    2002         QMAKE_PKGCONFIG_DESTDIR = pkgconfig
    2003         lib_replace.match = $$DESTDIR
    2004         lib_replace.replace = $$[QT_INSTALL_LIBS]
    2005         QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace
    2006     }
    2007 
    2008     GENMARSHALS = ../WebKit/gtk/webkit/webkit-marshal.list
    2009     GENMARSHALS_PREFIX = webkit_marshal
    2010 
    2011     #
    2012     # integrate glib-genmarshal as additional compiler
    2013     #
    2014     QMAKE_GENMARSHAL_CC = glib-genmarshal
    2015     glib-genmarshal.output = $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.cpp
    2016     glib-genmarshal.commands = echo 'extern \\"C\\" {' > ${QMAKE_FILE_OUT} && $${QMAKE_GENMARSHAL_CC} --prefix=$${GENMARSHALS_PREFIX} ${QMAKE_FILE_IN} --body >> ${QMAKE_FILE_OUT} && echo '}' >> ${QMAKE_FILE_OUT}
    2017     glib-genmarshal.input = GENMARSHALS
    2018     glib-genmarshal.variable_out = GENERATED_SOURCES
    2019     glib-genmarshal.name = GENMARSHALS
    2020     QMAKE_EXTRA_UNIX_COMPILERS += glib-genmarshal
    2021 
    2022     glib-genmarshalh.output = $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.h
    2023     glib-genmarshalh.commands = $${QMAKE_GENMARSHAL_CC} --prefix=$${GENMARSHALS_PREFIX} ${QMAKE_FILE_IN} --header > $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.h
    2024     glib-genmarshalh.input = GENMARSHALS
    2025     glib-genmarshalh.variable_out = GENERATED_SOURCES
    2026     glib-genmarshalh.name = GENMARSHALS
    2027     QMAKE_EXTRA_UNIX_COMPILERS += glib-genmarshalh
    2028 }
    20291780
    20301781linux-icc*:QMAKE_CXXFLAGS_RELEASE ~= s/-O2/-O0/

  • trunk/WebKit.pri

    r33005 r33518  
    77}
    88
    9 !gtk-port:CONFIG += qt-port
    10 qt-port:DEFINES += BUILDING_QT__=1
    11 qt-port:!building-libs {
     9DEFINES += BUILDING_QT__=1
     10!building-libs {
    1211    QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
    1312    LIBS += -lQtWebKit
    1413    DEPENDPATH += $$PWD/WebKit/qt/Api
    15 }
    16 
    17 gtk-port:!building-libs {
    18     QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
    19     LIBS += -lWebKitGtk
    20     DEPENDPATH += $$PWD/WebKit/gtk $$PWD/WebKit/gtk/WebCoreSupport $$PWD/WebKit/gtk/webkit
    21 }
    22 
    23 gtk-port {
    24     CONFIG += link_pkgconfig
    25 
    26     DEFINES += BUILDING_CAIRO__=1 BUILDING_GTK__=1
    27 
    28     # We use FreeType directly with Cairo
    29     PKGCONFIG += cairo-ft
    30 
    31     directfb: PKGCONFIG += cairo-directfb gtk+-directfb-2.0
    32     else: PKGCONFIG += cairo gtk+-2.0
    33 
    34     # Set a CONFIG flag for the GTK+ target (x11, quartz, win32, directfb)
    35     CONFIG += $$system(pkg-config --variable=target $$PKGCONFIG)
    36 
    37     # We use the curl http backend on all platforms
    38     PKGCONFIG += libcurl
    39     DEFINES += WTF_USE_CURL=1
    40 
    41     LIBS += -lWebKitGtk -ljpeg -lpng
    42 
    43     QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
    44     QMAKE_LIBS += $$system(icu-config --ldflags)
    45 
    46     # This set of warnings is borrowed from the Mac build
    47     QMAKE_CXXFLAGS += -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef
    48 
    49     # These flags are based on optimization experience from the Mac port:
    50     # Helps code size significantly and speed a little
    51     QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
    52 
    53     DEPENDPATH += $$PWD/JavaScriptCore/API
    54     INCLUDEPATH += $$PWD
    5514}
    5615
    … …  
    6019}
    6120
    62 gtk-port:CONFIG(debug) {
    63     DEFINES += G_DISABLE_DEPRECATED GDK_PIXBUF_DISABLE_DEPRECATED GDK_DISABLE_DEPRECATED GTK_DISABLE_DEPRECATED PANGO_DISABLE_DEPRECATED
    64 # maybe useful for debugging   DEFINES += GDK_MULTIHEAD_SAFE GTK_MULTIHEAD_SAFE
    65 }
    66 
    6721BASE_DIR = $$PWD
    68 qt-port:INCLUDEPATH += \
    69     $$PWD/WebKit/qt/Api
    70 gtk-port:INCLUDEPATH += \
    71     $$BASE_DIR/WebCore/platform/gtk \
    72     $$BASE_DIR/WebCore/platform/network/curl \
    73     $$BASE_DIR/WebCore/platform/graphics/cairo \
    74     $$BASE_DIR/WebCore/loader/gtk \
    75     $$BASE_DIR/WebCore/page/gtk \
    76     $$BASE_DIR/WebKit/gtk \
    77     $$BASE_DIR/WebKit/gtk/WebCoreSupport \
    78     $$BASE_DIR/WebKit/gtk/webkit
    7922INCLUDEPATH += \
     23    $$PWD/WebKit/qt/Api \
    8024    $$BASE_DIR/JavaScriptCore/ \
    8125    $$BASE_DIR/JavaScriptCore/kjs \

  • trunk/WebKit.pro

    r29714 r33518  
    11TEMPLATE = subdirs
    22CONFIG += ordered
    3 !gtk-port:CONFIG += qt-port
    4 qt-port {
    5     lessThan(QT_MINOR_VERSION, 4) {
    6         !win32-*:SUBDIRS += WebKit/qt/Plugins
    7     }
    8 }
     3
    94SUBDIRS += \
    105        WebCore \
    11         JavaScriptCore/kjs/testkjs.pro
     6        JavaScriptCore/kjs/testkjs.pro \
     7        WebKit/qt/QtLauncher
    128
    13 qt-port {
    14     SUBDIRS += WebKit/qt/QtLauncher
     9!win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
    1510
    16     !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
    17 }
    18 
    19 gtk-port:SUBDIRS += \
    20         WebKitTools/GtkLauncher \
    21         WebKitTools/DumpRenderTree/gtk/DumpRenderTree.pro
Note: See TracChangeset for help on using the changeset viewer.