2008-05-15 Ariya Hidayat <ariya.hidayat@trolltech.com>

        Reviewed by Simon.

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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@33518 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 6e93726..ab10a61 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-05-15  Ariya Hidayat  <ariya.hidayat@trolltech.com>
+
+        Reviewed by Simon.
+
+        Since WebKitGtk is fully using autotools now, clean-up the .pro/.pri files
+        from gtk-port.
+
+        * WebKit.pri:
+        * WebKit.pro:
+
 2008-05-09  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Mark.

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index e150d2f..e486787 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2008-05-15  Ariya Hidayat  <ariya.hidayat@trolltech.com>
+
+        Reviewed by Simon.
+
+        Since WebKitGtk is fully using autotools now, clean-up the .pro/.pri files
+        from gtk-port.
+
+        * JavaScriptCore.pro:
+        * kjs/testkjs.pro:
+
 2008-05-15  Kevin McCullough  <kmccullough@apple.com>
 
         - Build fix.

diff --git a/JavaScriptCore/JavaScriptCore.pri b/JavaScriptCore/JavaScriptCore.pri
index 057fbb0..2de9833 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.pri
+++ b/JavaScriptCore/JavaScriptCore.pri
@@ -5,12 +5,7 @@ INCLUDEPATH += tmp
 INCLUDEPATH += $$PWD $$PWD/kjs $$PWD/wtf $$PWD/wtf/unicode
 DEPENDPATH += $$PWD $$PWD/kjs $$PWD/wtf $$PWD/wtf/unicode
 DEFINES -= KJS_IDENTIFIER_HIDE_GLOBALS 
-qt-port:DEFINES += BUILDING_QT__
-gtk-port:DEFINES += BUILDING_GTK__
-
-# http://bugs.webkit.org/show_bug.cgi?id=16406
-# [Gtk] JavaScriptCore needs -lpthread
-gtk-port:!win32-*:LIBS += -lpthread
+DEFINES += BUILDING_QT__
 
 win32-msvc*: INCLUDEPATH += $$PWD/os-win32
 
@@ -54,10 +49,6 @@ SOURCES += \
 
 # AllInOneFile.cpp helps gcc analize and optimize code
 # Other compilers may be able to do this at link time
-gtk-port:CONFIG(release) {
-SOURCES += \
-    kjs/AllInOneFile.cpp
-} else {
 SOURCES += \
     kjs/function.cpp \
     kjs/debugger.cpp \
@@ -101,17 +92,7 @@ SOURCES += \
     profiler/ProfileNode.cpp \
     profiler/Profile.cpp \
     profiler/Profiler.cpp \
-    wtf/FastMalloc.cpp
-
-!qt-port:SOURCES += \
-    wtf/TCSystemAlloc.cpp
-}
-
-gtk-port:SOURCES += \
-    wtf/ThreadingGtk.cpp \
-    wtf/gtk/MainThreadGtk.cpp
-
-!gtk-port:SOURCES += \
+    wtf/FastMalloc.cpp \
     wtf/ThreadingQt.cpp \
     wtf/qt/MainThreadQt.cpp
 

diff --git a/JavaScriptCore/kjs/testkjs.pro b/JavaScriptCore/kjs/testkjs.pro
index 48781c5..cabeace 100644 (file)
--- a/JavaScriptCore/kjs/testkjs.pro
+++ b/JavaScriptCore/kjs/testkjs.pro
@@ -6,16 +6,10 @@ QT -= gui
 DEFINES -= KJS_IDENTIFIER_HIDE_GLOBALS 
 INCLUDEPATH += $$PWD/.. $$PWD $$PWD/../bindings $$PWD/../bindings/c $$PWD/../wtf
 CONFIG -= app_bundle
-qt-port:DEFINES += BUILDING_QT__
-#qt-port:LIBS += -L$$OUTPUT_DIR/lib -lQtWebKit
+DEFINES += BUILDING_QT__
 
 CONFIG += link_pkgconfig
-gtk-port:PKGCONFIG += glib-2.0 gobject-2.0 gthread-2.0
 
-gtk-port {
-    QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
-    LIBS += $$system(icu-config --ldflags)
-}
 QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
 
 isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD/../..
@@ -36,6 +30,6 @@ SOURCES -= API/JSBase.cpp \
     API/JSStringRef.cpp \
     API/JSValueRef.cpp
 
-qt-port:lessThan(QT_MINOR_VERSION, 4) {
+lessThan(QT_MINOR_VERSION, 4) {
     DEFINES += QT_BEGIN_NAMESPACE="" QT_END_NAMESPACE=""
 }

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index be68997..946345b 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2008-05-15  Ariya Hidayat  <ariya.hidayat@trolltech.com>
+
+        Reviewed by Simon.
+
+        Since WebKitGtk is fully using autotools now, clean-up the .pro/.pri files
+        from gtk-port.
+
+        * WebCore.pro:
+
 2008-05-16  Simon Hausmann  <hausmann@webkit.org>
 
         Fix the Gtk build.

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index a6fcee7..2bd5ea6 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -5,11 +5,9 @@ CONFIG += building-libs
 # of API/Node.c and dom/Node.cpp
 CONFIG += no_batch
 include($$PWD/../WebKit.pri)
-gtk-port:LIBS -= -lWebKitGtk
 
 TEMPLATE = lib
-qt-port:TARGET = QtWebKit
-gtk-port:TARGET = WebKitGtk
+TARGET = QtWebKit
 
 CONFIG(QTDIR_build) {
     GENERATED_SOURCES_DIR = $$PWD/generated
@@ -66,27 +64,22 @@ win32-g++ {
     QMAKE_LIBDIR_POST += $$split(TMPPATH,";")
 }
 
-gtk-port: PKGCONFIG += gthread-2.0
-
 # Optional components (look for defs in config.h and included files!)
 !contains(DEFINES, ENABLE_CROSS_DOCUMENT_MESSAGING=.): DEFINES += ENABLE_CROSS_DOCUMENT_MESSAGING=1
 !contains(DEFINES, ENABLE_DASHBOARD_SUPPORT=.): DEFINES += ENABLE_DASHBOARD_SUPPORT=0
 !contains(DEFINES, ENABLE_DATABASE=.): DEFINES += ENABLE_DATABASE=1
 !contains(DEFINES, ENABLE_ICONDATABASE=.): DEFINES += ENABLE_ICONDATABASE=1
 !contains(DEFINES, ENABLE_XPATH=.): DEFINES += ENABLE_XPATH=1
-gtk-port:!contains(DEFINES, ENABLE_XSLT=.): DEFINES += ENABLE_XSLT=1
 #!contains(DEFINES, ENABLE_XBL=.): DEFINES += ENABLE_XBL=1
-qt-port: !contains(DEFINES, ENABLE_SVG=.): DEFINES += ENABLE_SVG=1
-qt-port: !contains(DEFINES, ENABLE_SVG_FOREIGN_OBJECT=.): DEFINES += ENABLE_SVG_FOREIGN_OBJECT=1
-qt-port: !contains(DEFINES, ENABLE_SVG_ANIMATION=.): DEFINES += ENABLE_SVG_ANIMATION=1
-#qt-port: !contains(DEFINES, ENABLE_SVG_AS_IMAGE=.): DEFINES += ENABLE_SVG_AS_IMAGE=1
-qt-port: !contains(DEFINES, ENABLE_SVG_USE=.): DEFINES += ENABLE_SVG_USE=1
-gtk-port:DEFINES += ENABLE_SVG=0
-qt-port:contains(QT_CONFIG, phonon):DEFINES += ENABLE_VIDEO=1
+!contains(DEFINES, ENABLE_SVG=.): DEFINES += ENABLE_SVG=1
+!contains(DEFINES, ENABLE_SVG_FOREIGN_OBJECT=.): DEFINES += ENABLE_SVG_FOREIGN_OBJECT=1
+!contains(DEFINES, ENABLE_SVG_ANIMATION=.): DEFINES += ENABLE_SVG_ANIMATION=1
+#!contains(DEFINES, ENABLE_SVG_AS_IMAGE=.): DEFINES += ENABLE_SVG_AS_IMAGE=1
+!contains(DEFINES, ENABLE_SVG_USE=.): DEFINES += ENABLE_SVG_USE=1
+contains(QT_CONFIG, phonon):DEFINES += ENABLE_VIDEO=1
 else:DEFINES += ENABLE_VIDEO=0
-qt-port:unix:!mac:!embedded: DEFINES += XP_UNIX ENABLE_NETSCAPE_PLUGIN_API=1
-gtk-port:x11:plugins: DEFINES += XP_UNIX ENABLE_NETSCAPE_PLUGIN_API=1
-qt-port: DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1
+unix:!mac:!embedded: DEFINES += XP_UNIX ENABLE_NETSCAPE_PLUGIN_API=1
+DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1
 
 DEFINES += WTF_CHANGES=1
 
@@ -127,70 +120,22 @@ include($$PWD/../JavaScriptCore/JavaScriptCore.pri)
 #INCLUDEPATH += $$PWD/../JavaScriptCore
 #LIBS += -L$$OUTPUT_DIR/lib -lJavaScriptCore
 
-qt-port {
-    RESOURCES += \
-        $$PWD/../WebCore/page/inspector/WebKit.qrc \
-        $$PWD/../WebCore/Resources/WebKitResources.qrc
-    INCLUDEPATH += \
-        $$PWD/platform/qt \
-        $$PWD/platform/network/qt \
-        $$PWD/platform/graphics/qt \
-        $$PWD/svg/graphics/qt \
-        $$PWD/loader/qt \
-        $$PWD/page/qt \
-        $$PWD/../WebKit/qt/WebCoreSupport \
-        $$PWD/../WebKit/qt/Api \
-        $$PWD/bridge/qt
-
-    DEPENDPATH += editing/qt history/qt loader/qt page/qt \
-        platform/graphics/qt ../WebKit/qt/Api ../WebKit/qt/WebCoreSupport
-
-}
-
-gtk-port {
-    hildon {
-        DEFINES += MAEMO_CHANGES
-        PKGCONFIG += hildon-1
-    }
-
-    INCLUDEPATH += \
-    $$PWD/platform/gtk \
-    $$PWD/platform/graphics/gtk \
-    $$PWD/platform/graphics/cairo \
-    $$PWD/svg/graphics/cairo \
-    $$PWD/platform/network/curl \
-    $$PWD/platform/image-decoders \
-    $$PWD/platform/image-decoders/bmp \
-    $$PWD/platform/image-decoders/gif \
-    $$PWD/platform/image-decoders/ico \
-    $$PWD/platform/image-decoders/jpeg \
-    $$PWD/platform/image-decoders/png \
-    $$PWD/platform/image-decoders/xbm \
-    $$PWD/loader/gtk \
-    $$PWD/page/gtk \
-    $$PWD/../WebKit/gtk \
-    $$PWD/../WebKit/gtk/WebCoreSupport \
-    $$PWD/../WebKit/gtk/webkit
-
-    DEPENDPATH += \
-    platform/gtk \
-    platform/graphics/gtk \
-    platform/graphics/cairo \
-    svg/graphics/cairo \
-    platform/network/curl \
-    platform/image-decoders \
-    platform/image-decoders/bmp \
-    platform/image-decoders/gif \
-    platform/image-decoders/ico \
-    platform/image-decoders/jpeg \
-    platform/image-decoders/png \
-    platform/image-decoders/xbm \
-    loader/gtk \
-    page/gtk \
-    ../WebKit/gtk \
-    ../WebKit/gtk/WebCoreSupport \
-    ../WebKit/gtk/webkit
-}
+RESOURCES += \
+    $$PWD/../WebCore/page/inspector/WebKit.qrc \
+    $$PWD/../WebCore/Resources/WebKitResources.qrc
+INCLUDEPATH += \
+    $$PWD/platform/qt \
+    $$PWD/platform/network/qt \
+    $$PWD/platform/graphics/qt \
+    $$PWD/svg/graphics/qt \
+    $$PWD/loader/qt \
+    $$PWD/page/qt \
+    $$PWD/../WebKit/qt/WebCoreSupport \
+    $$PWD/../WebKit/qt/Api \
+    $$PWD/bridge/qt
+
+DEPENDPATH += editing/qt history/qt loader/qt page/qt \
+    platform/graphics/qt ../WebKit/qt/Api ../WebKit/qt/WebCoreSupport
 
 # Make sure storage/ appears before JavaScriptCore/kjs. Both provide LocalStorage.h
 # but the header from the former include path is included across directories while
@@ -963,19 +908,7 @@ SOURCES += \
     xml/XSLTUnicodeSort.cpp \
     xml/XSLTProcessor.cpp
 
-gtk-port {
-  SOURCES += \
-    platform/graphics/GlyphPageTreeNode.cpp \
-    platform/graphics/GlyphWidthMap.cpp \
-    platform/graphics/FontCache.cpp \
-    platform/graphics/Font.cpp \
-    platform/graphics/FontFallbackList.cpp \
-    platform/graphics/SimpleFontData.cpp 
-}
-
-qt-port {
-
-    HEADERS += \
+HEADERS += \
     $$PWD/platform/graphics/qt/StillImageQt.h \
     $$PWD/platform/qt/QWebPopup.h \
     $$PWD/platform/qt/MenuEventProxy.h \
@@ -988,7 +921,7 @@ qt-port {
     $$PWD/../WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h \
     $$PWD/platform/network/qt/QNetworkReplyHandler.h
 
-    SOURCES += \
+SOURCES += \
     bridge/qt/qt_class.cpp \
     bridge/qt/qt_instance.cpp \
     bridge/qt/qt_runtime.cpp \
@@ -1085,123 +1018,15 @@ qt-port {
 
         DEFINES += QT_BEGIN_NAMESPACE="" QT_END_NAMESPACE=""
      }
-}
-
-gtk-port {
-    HEADERS += \
-        ../WebCore/platform/gtk/ClipboardGtk.h \
-        ../WebCore/platform/gtk/PasteboardHelper.h \
-        ../WebKit/gtk/webkit/webkit.h \
-        ../WebKit/gtk/webkit/webkitdefines.h \
-        ../WebKit/gtk/webkit/webkitnetworkrequest.h \
-        ../WebKit/gtk/webkit/webkitprivate.h \
-        ../WebKit/gtk/webkit/webkitwebbackforwardlist.h \
-        ../WebKit/gtk/webkit/webkitwebframe.h \
-        ../WebKit/gtk/webkit/webkitwebhistoryitem.h \
-        ../WebKit/gtk/webkit/webkitwebsettings.h \
-        ../WebKit/gtk/webkit/webkitwebview.h \
-        ../WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
-        ../WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \
-        ../WebKit/gtk/WebCoreSupport/DragClientGtk.h \
-        ../WebKit/gtk/WebCoreSupport/EditorClientGtk.h \
-        ../WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \
-        ../WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \
-        ../WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h
-    SOURCES += \
-        platform/graphics/StringTruncator.cpp \
-        platform/text/TextCodecICU.cpp \
-        platform/text/TextBoundariesICU.cpp \
-        platform/text/TextBreakIteratorICU.cpp \
-        page/gtk/EventHandlerGtk.cpp \
-        page/gtk/FrameGtk.cpp \
-        page/gtk/DragControllerGtk.cpp \
-        platform/gtk/ClipboardGtk.cpp \
-        platform/gtk/CookieJarGtk.cpp \
-        platform/gtk/CursorGtk.cpp \
-        platform/gtk/ContextMenuGtk.cpp \
-        platform/gtk/ContextMenuItemGtk.cpp \
-        platform/gtk/DragDataGtk.cpp \
-        platform/gtk/DragImageGtk.cpp \
-        platform/gtk/FileChooserGtk.cpp \
-        platform/gtk/FileSystemGtk.cpp \
-        platform/graphics/gtk/FontCacheGtk.cpp \
-        platform/graphics/gtk/FontCustomPlatformData.cpp \
-        platform/graphics/gtk/FontGtk.cpp \
-        platform/graphics/gtk/FontPlatformDataGtk.cpp \
-        platform/graphics/gtk/GlyphPageTreeNodeGtk.cpp \
-        platform/graphics/gtk/SimpleFontDataGtk.cpp \
-        platform/gtk/KeyEventGtk.cpp \
-        platform/gtk/Language.cpp \
-        platform/gtk/LocalizedStringsGtk.cpp \
-        platform/gtk/LoggingGtk.cpp \
-        platform/gtk/MIMETypeRegistryGtk.cpp \
-        platform/gtk/MouseEventGtk.cpp \
-        platform/gtk/PasteboardGtk.cpp \
-        platform/gtk/PlatformScreenGtk.cpp \
-        platform/gtk/PlatformScrollBarGtk.cpp \
-        platform/gtk/PopupMenuGtk.cpp \
-        platform/gtk/RenderThemeGtk.cpp \
-        platform/gtk/SearchPopupMenuGtk.cpp \
-        platform/gtk/ScrollViewGtk.cpp \
-        platform/gtk/SharedTimerGtk.cpp \
-        platform/gtk/SoundGtk.cpp \
-        platform/gtk/SystemTimeGtk.cpp \
-        platform/gtk/TemporaryLinkStubs.cpp \
-        platform/text/gtk/TextBreakIteratorInternalICUGtk.cpp \
-        platform/gtk/WheelEventGtk.cpp \
-        platform/gtk/WidgetGtk.cpp \
-        platform/gtk/gtk2drawing.c \
-        platform/graphics/gtk/ColorGtk.cpp \
-        platform/graphics/gtk/IconGtk.cpp \
-        platform/graphics/gtk/ImageGtk.cpp \
-        platform/graphics/gtk/IntPointGtk.cpp \
-        platform/graphics/gtk/IntRectGtk.cpp \
-        platform/network/curl/ResourceHandleCurl.cpp \
-        platform/network/curl/ResourceHandleManager.cpp \
-        platform/graphics/cairo/AffineTransformCairo.cpp \
-        platform/graphics/cairo/FontCairo.cpp \
-        platform/graphics/cairo/GraphicsContextCairo.cpp \
-        platform/graphics/cairo/ImageBufferCairo.cpp \
-        platform/graphics/cairo/ImageCairo.cpp \
-        platform/graphics/cairo/ImageSourceCairo.cpp \
-        platform/graphics/cairo/PathCairo.cpp \
-        platform/image-decoders/gif/GIFImageDecoder.cpp \
-        platform/image-decoders/gif/GIFImageReader.cpp  \
-        platform/image-decoders/png/PNGImageDecoder.cpp \
-        platform/image-decoders/jpeg/JPEGImageDecoder.cpp \
-        platform/image-decoders/bmp/BMPImageDecoder.cpp \
-        platform/image-decoders/ico/ICOImageDecoder.cpp \
-        platform/image-decoders/xbm/XBMImageDecoder.cpp \
-        ../WebKit/gtk/webkit/webkitnetworkrequest.cpp \
-        ../WebKit/gtk/webkit/webkitprivate.cpp \
-        ../WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
-        ../WebKit/gtk/webkit/webkitwebframe.cpp \
-        ../WebKit/gtk/webkit/webkitwebhistoryitem.cpp \
-        ../WebKit/gtk/webkit/webkitwebsettings.cpp \
-        ../WebKit/gtk/webkit/webkitwebview.cpp \
-        ../WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
-        ../WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
-        ../WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \
-        ../WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \
-        ../WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \
-        ../WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \
-        ../WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp
-}
-
 
 contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {
-    qt-port {
         unix:!mac {
             SOURCES += \
                 plugins/qt/PluginPackageQt.cpp \
                 plugins/qt/PluginDatabaseQt.cpp \
                 plugins/qt/PluginViewQt.cpp
-        }
     }
 
-    gtk-port {
-        INCLUDEPATH += ../WebCore/plugins/gtk
-    }
 }
 
 contains(DEFINES, ENABLE_CROSS_DOCUMENT_MESSAGING=1) {
@@ -1232,7 +1057,7 @@ contains(DEFINES, ENABLE_DATABASE=1) {
             SOURCES += $$QT_SOURCE_TREE/src/3rdparty/sqlite/sqlite3.c
         }
     } else {
-        qt-port: INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/
+        INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/
         LIBS += -lsqlite3
     }
 
@@ -1331,7 +1156,6 @@ contains(DEFINES, ENABLE_VIDEO=1) {
         rendering/RenderMedia.cpp \
         bindings/js/JSAudioConstructor.cpp
 
-    qt-port {
         HEADERS += \
             platform/graphics/qt/MediaPlayerPrivatePhonon.h
 
@@ -1348,18 +1172,7 @@ contains(DEFINES, ENABLE_VIDEO=1) {
             INCLUDEPATH -= $$QMAKE_LIBDIR_QT/phonon.framework/Headers
             INCLUDEPATH += $$QMAKE_LIBDIR_QT/phonon.framework/Headers
         }
-    }
-
-    gtk-port {
-        SOURCES += \
-            platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp \
-            platform/graphics/gtk/VideoSinkGStreamer.cpp
-
-        CONFIG(debug):DEFINES += GST_DISABLE_DEPRECATED
 
-        PKGCONFIG += gstreamer-0.10 gstreamer-plugins-base-0.10 gnome-vfs-2.0
-        LIBS += -lgstinterfaces-0.10 -lgstbase-0.10 -lgstvideo-0.10
-    }
 }
 
 contains(DEFINES, ENABLE_XPATH=1) {
@@ -1399,13 +1212,7 @@ contains(DEFINES, ENABLE_SVG=1) {
     FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG=1
 
     DEPENDPATH += svg svg/graphics
-    qt-port {
     DEPENDPATH += svg/graphics/qt
-    }
-
-    gtk-port {
-    DEPENDPATH += svg/graphics/cairo
-    }
 
     SVG_NAMES = $$PWD/svg/svgtags.in
 
@@ -1746,7 +1553,7 @@ contains(DEFINES, ENABLE_SVG=1) {
         rendering/SVGRenderSupport.cpp \
         rendering/SVGRootInlineBox.cpp
 
-qt-port:SOURCES += \
+SOURCES += \
         svg/graphics/qt/RenderPathQt.cpp \
         svg/graphics/qt/SVGPaintServerGradientQt.cpp \
         svg/graphics/qt/SVGPaintServerLinearGradientQt.cpp \
@@ -1758,14 +1565,6 @@ qt-port:SOURCES += \
         svg/graphics/qt/SVGResourceFilterQt.cpp \
         svg/graphics/qt/SVGResourceMaskerQt.cpp
 
-gtk-port:SOURCES += \
-        svg/graphics/cairo/RenderPathCairo.cpp \
-        svg/graphics/cairo/SVGPaintServerCairo.cpp \
-        svg/graphics/cairo/SVGPaintServerGradientCairo.cpp \
-        svg/graphics/cairo/SVGPaintServerPatternCairo.cpp \
-        svg/graphics/cairo/SVGPaintServerSolidCairo.cpp \
-        svg/graphics/cairo/SVGResourceClipperCairo.cpp \
-        svg/graphics/cairo/SVGResourceMaskerCairo.cpp
 
         # GENERATOR 5-C:
         svgnames_a.output = $$GENERATED_SOURCES_DIR/SVGNames.cpp
@@ -1946,7 +1745,7 @@ xpathbison.variable_out = GENERATED_SOURCES
 xpathbison.clean = ${QMAKE_FILE_OUT} ${QMAKE_VAR_GENERATED_SOURCES_DIR_SLASH}${QMAKE_FILE_BASE}.h
 addExtraCompiler(xpathbison)
 
-qt-port:!CONFIG(QTDIR_build) {
+!CONFIG(QTDIR_build) {
     target.path = $$[QT_INSTALL_LIBS]
     include($$PWD/../WebKit/qt/Api/headers.pri)
     headers.files = $$WEBKIT_API_HEADERS
@@ -1978,53 +1777,5 @@ qt-port:!CONFIG(QTDIR_build) {
     }
 }
 
-gtk-port {
-    isEmpty(WEBKIT_LIB_DIR):WEBKIT_LIB_DIR=/usr/local/lib
-    isEmpty(WEBKIT_INC_DIR):WEBKIT_INC_DIR=/usr/local/include/WebKitGtk
-
-    target.path = $$WEBKIT_LIB_DIR
-    INSTALLS += target
-
-    include($$PWD/../WebKit/gtk/webkit/headers.pri)
-    headers.files = $$WEBKIT_API_HEADERS
-    headers.path = $$WEBKIT_INC_DIR
-    INSTALLS += headers
-
-    include($$PWD/../JavaScriptCore/headers.pri)
-    jsheaders.files = $$JS_API_HEADERS
-    jsheaders.path = $$WEBKIT_INC_DIR/JavaScriptCore
-    INSTALLS += jsheaders
-
-    unix {
-        CONFIG += create_pc create_prl
-        QMAKE_PKGCONFIG_LIBDIR = $$target.path
-        QMAKE_PKGCONFIG_INCDIR = $$headers.path
-        QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-        lib_replace.match = $$DESTDIR
-        lib_replace.replace = $$[QT_INSTALL_LIBS]
-        QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace
-    }
-
-    GENMARSHALS = ../WebKit/gtk/webkit/webkit-marshal.list
-    GENMARSHALS_PREFIX = webkit_marshal
-
-    #
-    # integrate glib-genmarshal as additional compiler
-    #
-    QMAKE_GENMARSHAL_CC = glib-genmarshal
-    glib-genmarshal.output = $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.cpp
-    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}
-    glib-genmarshal.input = GENMARSHALS
-    glib-genmarshal.variable_out = GENERATED_SOURCES
-    glib-genmarshal.name = GENMARSHALS
-    QMAKE_EXTRA_UNIX_COMPILERS += glib-genmarshal
-
-    glib-genmarshalh.output = $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.h
-    glib-genmarshalh.commands = $${QMAKE_GENMARSHAL_CC} --prefix=$${GENMARSHALS_PREFIX} ${QMAKE_FILE_IN} --header > $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.h
-    glib-genmarshalh.input = GENMARSHALS
-    glib-genmarshalh.variable_out = GENERATED_SOURCES
-    glib-genmarshalh.name = GENMARSHALS
-    QMAKE_EXTRA_UNIX_COMPILERS += glib-genmarshalh
-}
 
 linux-icc*:QMAKE_CXXFLAGS_RELEASE ~= s/-O2/-O0/

diff --git a/WebKit.pri b/WebKit.pri
index df625ca..19c818a 100644 (file)
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -6,77 +6,21 @@ isEmpty(OUTPUT_DIR) {
     CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug
 }
 
-!gtk-port:CONFIG += qt-port
-qt-port:DEFINES += BUILDING_QT__=1
-qt-port:!building-libs {
+DEFINES += BUILDING_QT__=1
+!building-libs {
     QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
     LIBS += -lQtWebKit
     DEPENDPATH += $$PWD/WebKit/qt/Api
 }
 
-gtk-port:!building-libs {
-    QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
-    LIBS += -lWebKitGtk
-    DEPENDPATH += $$PWD/WebKit/gtk $$PWD/WebKit/gtk/WebCoreSupport $$PWD/WebKit/gtk/webkit
-}
-
-gtk-port {
-    CONFIG += link_pkgconfig
-
-    DEFINES += BUILDING_CAIRO__=1 BUILDING_GTK__=1
-
-    # We use FreeType directly with Cairo
-    PKGCONFIG += cairo-ft
-
-    directfb: PKGCONFIG += cairo-directfb gtk+-directfb-2.0
-    else: PKGCONFIG += cairo gtk+-2.0
-
-    # Set a CONFIG flag for the GTK+ target (x11, quartz, win32, directfb)
-    CONFIG += $$system(pkg-config --variable=target $$PKGCONFIG)
-
-    # We use the curl http backend on all platforms
-    PKGCONFIG += libcurl
-    DEFINES += WTF_USE_CURL=1
-
-    LIBS += -lWebKitGtk -ljpeg -lpng
-
-    QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
-    QMAKE_LIBS += $$system(icu-config --ldflags)
-
-    # This set of warnings is borrowed from the Mac build
-    QMAKE_CXXFLAGS += -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef
-
-    # These flags are based on optimization experience from the Mac port:
-    # Helps code size significantly and speed a little
-    QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
-
-    DEPENDPATH += $$PWD/JavaScriptCore/API
-    INCLUDEPATH += $$PWD
-}
-
 DEFINES += USE_SYSTEM_MALLOC
 CONFIG(release) {
     DEFINES += NDEBUG
 }
 
-gtk-port:CONFIG(debug) {
-    DEFINES += G_DISABLE_DEPRECATED GDK_PIXBUF_DISABLE_DEPRECATED GDK_DISABLE_DEPRECATED GTK_DISABLE_DEPRECATED PANGO_DISABLE_DEPRECATED
-# maybe useful for debugging   DEFINES += GDK_MULTIHEAD_SAFE GTK_MULTIHEAD_SAFE
-}
-
 BASE_DIR = $$PWD
-qt-port:INCLUDEPATH += \
-    $$PWD/WebKit/qt/Api
-gtk-port:INCLUDEPATH += \
-    $$BASE_DIR/WebCore/platform/gtk \
-    $$BASE_DIR/WebCore/platform/network/curl \
-    $$BASE_DIR/WebCore/platform/graphics/cairo \
-    $$BASE_DIR/WebCore/loader/gtk \
-    $$BASE_DIR/WebCore/page/gtk \
-    $$BASE_DIR/WebKit/gtk \
-    $$BASE_DIR/WebKit/gtk/WebCoreSupport \
-    $$BASE_DIR/WebKit/gtk/webkit
 INCLUDEPATH += \
+    $$PWD/WebKit/qt/Api \
     $$BASE_DIR/JavaScriptCore/ \
     $$BASE_DIR/JavaScriptCore/kjs \
     $$BASE_DIR/JavaScriptCore/bindings \

diff --git a/WebKit.pro b/WebKit.pro
index bc14feb..ae56059 100644 (file)
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -1,21 +1,10 @@
 TEMPLATE = subdirs
 CONFIG += ordered
-!gtk-port:CONFIG += qt-port
-qt-port {
-    lessThan(QT_MINOR_VERSION, 4) {
-        !win32-*:SUBDIRS += WebKit/qt/Plugins
-    }
-}
+
 SUBDIRS += \
         WebCore \
-        JavaScriptCore/kjs/testkjs.pro
-
-qt-port {
-    SUBDIRS += WebKit/qt/QtLauncher
+        JavaScriptCore/kjs/testkjs.pro \
+        WebKit/qt/QtLauncher
 
-    !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
-}
+!win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
 
-gtk-port:SUBDIRS += \
-        WebKitTools/GtkLauncher \
-        WebKitTools/DumpRenderTree/gtk/DumpRenderTree.pro