2010-08-07 Sheriff Bot <webkit.review.bot@gmail.com>
authorabecsi@webkit.org <abecsi@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 7 Aug 2010 12:22:02 +0000 (12:22 +0000)
committerabecsi@webkit.org <abecsi@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 7 Aug 2010 12:22:02 +0000 (12:22 +0000)
        Unreviewed, rolling out r64904.
        http://trac.webkit.org/changeset/64904
        https://bugs.webkit.org/show_bug.cgi?id=43671

        Broke the Qt Windows builders. (Requested by bbandix on
        #webkit).

        * WebCore.pri:
        * WebCore.pro:
        * features.pri: Removed.
2010-08-07  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r64904.
        http://trac.webkit.org/changeset/64904
        https://bugs.webkit.org/show_bug.cgi?id=43671

        Broke the Qt Windows builders. (Requested by bbandix on
        #webkit).

        * WebKit.pro:
2010-08-07  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r64904.
        http://trac.webkit.org/changeset/64904
        https://bugs.webkit.org/show_bug.cgi?id=43671

        Broke the Qt Windows builders. (Requested by bbandix on
        #webkit).

        * WebKit2.pri: Removed.
        * WebKit2.pro:
        * WebProcess.pro: Removed.

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

ChangeLog
WebCore/ChangeLog
WebCore/WebCore.pri
WebCore/WebCore.pro
WebCore/features.pri [deleted file]
WebKit.pro
WebKit2/ChangeLog
WebKit2/WebKit2.pri [deleted file]
WebKit2/WebKit2.pro
WebKit2/WebProcess.pro [deleted file]

index aa52061..d457bec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-07  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r64904.
+        http://trac.webkit.org/changeset/64904
+        https://bugs.webkit.org/show_bug.cgi?id=43671
+
+        Broke the Qt Windows builders. (Requested by bbandix on
+        #webkit).
+
+        * WebKit.pro:
+
 2010-08-07  Balazs Kelemen  <kb@inf.u-szeged.hu>
 
         Reviewed by Eric Seidel.
index 9bb94ae..5673755 100644 (file)
@@ -1,3 +1,16 @@
+2010-08-07  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r64904.
+        http://trac.webkit.org/changeset/64904
+        https://bugs.webkit.org/show_bug.cgi?id=43671
+
+        Broke the Qt Windows builders. (Requested by bbandix on
+        #webkit).
+
+        * WebCore.pri:
+        * WebCore.pro:
+        * features.pri: Removed.
+
 2010-08-07  Balazs Kelemen  <kb@inf.u-szeged.hu>
 
         Reviewed by Eric Seidel.
index b0effee..7dd0681 100644 (file)
@@ -1,6 +1,5 @@
 
 include(../common.pri)
-include(features.pri)
 
 CONFIG(standalone_package) {
     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/generated
@@ -8,6 +7,199 @@ CONFIG(standalone_package) {
     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = generated
 }
 
+CONFIG(minimal) {
+  DEFINES += ENABLE_NETSCAPE_PLUGIN_API=0
+}
+
+## load mobilityconfig if mobility is available 
+load(mobilityconfig, true)
+
+## Define default features macros for optional components
+## (look for defs in config.h and included files!)
+# Try to locate sqlite3 source
+CONFIG(QTDIR_build) {
+    SQLITE3SRCDIR = $$QT_SOURCE_TREE/src/3rdparty/sqlite/
+} else {
+    SQLITE3SRCDIR = $$(SQLITE3SRCDIR)
+    isEmpty(SQLITE3SRCDIR) {
+        SQLITE3SRCDIR = $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/
+    }
+}
+
+contains(DEFINES, ENABLE_SINGLE_THREADED=1) {
+    DEFINES+=ENABLE_DATABASE=0 ENABLE_DOM_STORAGE=0 ENABLE_ICONDATABASE=0 ENABLE_WORKERS=0 ENABLE_SHARED_WORKERS=0
+}
+
+# turn off SQLITE support if we do not have sqlite3 available
+!CONFIG(QTDIR_build):win32-*:!exists( $${SQLITE3SRCDIR}/sqlite3.c ): DEFINES += ENABLE_SQLITE=0 ENABLE_DATABASE=0 ENABLE_WORKERS=0 ENABLE_SHARED_WORKERS=0 ENABLE_ICONDATABASE=0 ENABLE_OFFLINE_WEB_APPLICATIONS=0 ENABLE_DOM_STORAGE=0
+
+!contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=.): DEFINES += ENABLE_JAVASCRIPT_DEBUGGER=1
+!contains(DEFINES, ENABLE_DATABASE=.): DEFINES += ENABLE_DATABASE=1
+!contains(DEFINES, ENABLE_EVENTSOURCE=.): DEFINES += ENABLE_EVENTSOURCE=1
+!contains(DEFINES, ENABLE_OFFLINE_WEB_APPLICATIONS=.): DEFINES += ENABLE_OFFLINE_WEB_APPLICATIONS=1
+!contains(DEFINES, ENABLE_DOM_STORAGE=.): DEFINES += ENABLE_DOM_STORAGE=1
+!contains(DEFINES, ENABLE_ICONDATABASE=.): DEFINES += ENABLE_ICONDATABASE=1
+!contains(DEFINES, ENABLE_CHANNEL_MESSAGING=.): DEFINES += ENABLE_CHANNEL_MESSAGING=1
+!contains(DEFINES, ENABLE_ORIENTATION_EVENTS=.): DEFINES += ENABLE_ORIENTATION_EVENTS=0
+!contains(DEFINES, ENABLE_DIRECTORY_UPLOAD=.): DEFINES += ENABLE_DIRECTORY_UPLOAD=0
+!contains(DEFINES, ENABLE_FILE_SYSTEM=.): DEFINES += ENABLE_FILE_SYSTEM=0
+
+# turn on SQLITE support if any of the dependent features are turned on
+!contains(DEFINES, ENABLE_SQLITE=.) {
+  contains(DEFINES, ENABLE_DATABASE=1)|contains(DEFINES, ENABLE_ICONDATABASE=1)|contains(DEFINES, ENABLE_DOM_STORAGE=1)|contains(DEFINES, ENABLE_OFFLINE_WEB_APPLICATIONS=1) {
+    DEFINES += ENABLE_SQLITE=1
+  } else {
+    DEFINES += ENABLE_SQLITE=0
+  }
+}
+
+!contains(DEFINES, ENABLE_DASHBOARD_SUPPORT=.): DEFINES += ENABLE_DASHBOARD_SUPPORT=0
+!contains(DEFINES, ENABLE_FILTERS=.): DEFINES += ENABLE_FILTERS=1
+!contains(DEFINES, ENABLE_XPATH=.): DEFINES += ENABLE_XPATH=1
+#!contains(DEFINES, ENABLE_XBL=.): DEFINES += ENABLE_XBL=1
+!contains(DEFINES, ENABLE_WCSS=.): DEFINES += ENABLE_WCSS=0
+!contains(DEFINES, ENABLE_WML=.): DEFINES += ENABLE_WML=0
+!contains(DEFINES, ENABLE_SHARED_WORKERS=.): DEFINES += ENABLE_SHARED_WORKERS=1
+!contains(DEFINES, ENABLE_WORKERS=.): DEFINES += ENABLE_WORKERS=1
+!contains(DEFINES, ENABLE_XHTMLMP=.): DEFINES += ENABLE_XHTMLMP=0
+!contains(DEFINES, ENABLE_DATAGRID=.): DEFINES += ENABLE_DATAGRID=0
+!contains(DEFINES, ENABLE_RUBY=.): DEFINES += ENABLE_RUBY=1
+!contains(DEFINES, ENABLE_SANDBOX=.): DEFINES += ENABLE_SANDBOX=1
+!contains(DEFINES, ENABLE_METER_TAG=.): DEFINES += ENABLE_METER_TAG=1
+!contains(DEFINES, ENABLE_PROGRESS_TAG=.): DEFINES += ENABLE_PROGRESS_TAG=1
+!contains(DEFINES, ENABLE_BLOB=.): DEFINES += ENABLE_BLOB=0
+!contains(DEFINES, ENABLE_NOTIFICATIONS=.): DEFINES += ENABLE_NOTIFICATIONS=1
+!contains(DEFINES, ENABLE_IMAGE_RESIZER=.): DEFINES += ENABLE_IMAGE_RESIZER=0
+!contains(DEFINES, ENABLE_INPUT_SPEECH=.): DEFINES += ENABLE_INPUT_SPEECH=0
+
+greaterThan(QT_MINOR_VERSION, 5) {
+    !contains(DEFINES, ENABLE_3D_RENDERING=.): DEFINES += ENABLE_3D_RENDERING=1
+}
+
+# SVG support
+!contains(DEFINES, ENABLE_SVG=0) {
+    !contains(DEFINES, ENABLE_SVG=.): DEFINES += ENABLE_SVG=1
+    !contains(DEFINES, ENABLE_SVG_FONTS=.): DEFINES += ENABLE_SVG_FONTS=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
+} else {
+    DEFINES += ENABLE_SVG_FONTS=0 ENABLE_SVG_FOREIGN_OBJECT=0 ENABLE_SVG_ANIMATION=0 ENABLE_SVG_AS_IMAGE=0 ENABLE_SVG_USE=0
+}
+
+# HTML5 datalist support
+!contains(DEFINES, ENABLE_DATALIST=.): DEFINES += ENABLE_DATALIST=1
+
+# Tiled Backing Store support
+greaterThan(QT_MINOR_VERSION, 5) {
+    !contains(DEFINES, ENABLE_TILED_BACKING_STORE=.): DEFINES += ENABLE_TILED_BACKING_STORE=1
+}
+
+# Nescape plugins support (NPAPI)
+!contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=.) {
+    unix|win32-*:!embedded:!wince*: {
+        DEFINES += ENABLE_NETSCAPE_PLUGIN_API=1
+    } else {
+        DEFINES += ENABLE_NETSCAPE_PLUGIN_API=0
+    }
+}
+
+# Web Socket support.
+!contains(DEFINES, ENABLE_WEB_SOCKETS=.): DEFINES += ENABLE_WEB_SOCKETS=1
+
+# Web Timing support.
+!contains(DEFINES, ENABLE_WEB_TIMING=.): DEFINES += ENABLE_WEB_TIMING=0
+
+# XSLT support with QtXmlPatterns
+!contains(DEFINES, ENABLE_XSLT=.) {
+    contains(QT_CONFIG, xmlpatterns):DEFINES += ENABLE_XSLT=1
+    else:DEFINES += ENABLE_XSLT=0
+}
+
+# geolocation support if QtMobility exists
+!CONFIG(QTDIR_build):!contains(DEFINES, ENABLE_GEOLOCATION=.) {
+    contains(MOBILITY_CONFIG, location) {
+       DEFINES += ENABLE_GEOLOCATION=1
+    }
+}
+
+# Bearer management is part of Qt 4.7
+# for older version, check for mobility with bearer 
+!contains(DEFINES, ENABLE_QT_BEARER=.) {
+     !lessThan(QT_MINOR_VERSION, 7) {
+        DEFINES += ENABLE_QT_BEARER=1
+     } else {
+        contains(MOBILITY_CONFIG, bearer) {
+            DEFINES += ENABLE_QT_BEARER=1
+        }
+    }
+}
+
+# Enable touch event support with Qt 4.6
+!lessThan(QT_MINOR_VERSION, 6): DEFINES += ENABLE_TOUCH_EVENTS=1
+
+# HTML5 Media Support
+# We require QtMultimedia or Phonon
+!contains(DEFINES, ENABLE_VIDEO=.) {
+    DEFINES -= ENABLE_VIDEO=1
+    DEFINES += ENABLE_VIDEO=0
+
+    !lessThan(QT_MINOR_VERSION, 6):contains(MOBILITY_CONFIG, multimedia) {
+        DEFINES -= ENABLE_VIDEO=0
+        DEFINES += ENABLE_VIDEO=1
+    } else:contains(QT_CONFIG, phonon) {
+        DEFINES -= ENABLE_VIDEO=0
+        DEFINES += ENABLE_VIDEO=1
+    }
+}
+
+# Used to compute defaults for the build-webkit script
+CONFIG(compute_defaults) {
+    message($$DEFINES)
+    error("Done computing defaults")
+}
+
+contains(DEFINES, ENABLE_WCSS=1) {
+    contains(DEFINES, ENABLE_XHTMLMP=0) {
+        DEFINES -= ENABLE_XHTMLMP=0
+        DEFINES += ENABLE_XHTMLMP=1
+    }
+}
+
+## Forward enabled feature macros to JavaScript enabled features macros
+FEATURE_DEFINES_JAVASCRIPT = LANGUAGE_JAVASCRIPT=1
+contains(DEFINES, ENABLE_CHANNEL_MESSAGING=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_CHANNEL_MESSAGING=1
+contains(DEFINES, ENABLE_ORIENTATION_EVENTS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_ORIENTATION_EVENTS=1
+contains(DEFINES, ENABLE_DASHBOARD_SUPPORT=0): DASHBOARDSUPPORTCSSPROPERTIES -= $$PWD/css/DashboardSupportCSSPropertyNames.in
+contains(DEFINES, ENABLE_DATAGRID=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATAGRID=1
+contains(DEFINES, ENABLE_EVENTSOURCE=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_EVENTSOURCE=1
+contains(DEFINES, ENABLE_DATABASE=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATABASE=1
+contains(DEFINES, ENABLE_DATALIST=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATALIST=1
+contains(DEFINES, ENABLE_DOM_STORAGE=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_DOM_STORAGE=1
+contains(DEFINES, ENABLE_SHARED_SCRIPT=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SHARED_SCRIPT=1
+contains(DEFINES, ENABLE_WORKERS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WORKERS=1
+contains(DEFINES, ENABLE_SHARED_WORKERS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SHARED_WORKERS=1
+contains(DEFINES, ENABLE_VIDEO=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_VIDEO=1
+contains(DEFINES, ENABLE_XPATH=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_XPATH=1
+contains(DEFINES, ENABLE_XSLT=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_XSLT=1
+contains(DEFINES, ENABLE_XBL=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_XBL=1
+contains(DEFINES, ENABLE_FILTERS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_FILTERS=1
+contains(DEFINES, ENABLE_WCSS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WCSS=1
+contains(DEFINES, ENABLE_WML=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WML=1
+contains(DEFINES, ENABLE_XHTMLMP=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_XHTMLMP=1
+contains(DEFINES, ENABLE_SVG=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG=1
+contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_JAVASCRIPT_DEBUGGER=1
+contains(DEFINES, ENABLE_OFFLINE_WEB_APPLICATIONS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_OFFLINE_WEB_APPLICATIONS=1
+contains(DEFINES, ENABLE_WEB_SOCKETS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WEB_SOCKETS=1
+contains(DEFINES, ENABLE_WEB_TIMING=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WEB_TIMING=1
+contains(DEFINES, ENABLE_TOUCH_EVENTS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_TOUCH_EVENTS=1
+contains(DEFINES, ENABLE_TILED_BACKING_STORE=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_TILED_BACKING_STORE=1
+contains(DEFINES, ENABLE_NOTIFICATIONS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_NOTIFICATIONS=1
+contains(DEFINES, ENABLE_METER_TAG=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_METER_TAG=1
+contains(DEFINES, ENABLE_PROGRESS_TAG=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_PROGRESS_TAG=1
+contains(DEFINES, ENABLE_GEOLOCATION=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_GEOLOCATION=1
+
 ## Derived source generators
 MATHML_NAMES = $$PWD/mathml/mathtags.in
 
index 389da00..6d69ec6 100644 (file)
@@ -155,11 +155,6 @@ contains(DEFINES, WTF_USE_QT_MOBILE_THEME=1) {
 include($$PWD/../JavaScriptCore/JavaScriptCore.pri)
 addJavaScriptCoreLib(../JavaScriptCore)
 
-webkit2 {
-    include($$PWD/../WebKit2/WebKit2.pri)
-    addWebKit2Lib(../WebKit2)
-}
-
 # Extract sources to build from the generator definitions
 defineTest(addExtraCompiler) {
     isEqual($${1}.wkAddOutputToSources, false): return(true)
@@ -3223,6 +3218,204 @@ SOURCES += \
     rendering/RenderLayerCompositor.cpp
 }
 
+webkit2 {
+
+CONFIG += precompile_header
+PRECOMPILED_HEADER = $$PWD/../WebKit2/WebKit2Prefix.h
+
+INCLUDEPATH = \
+    $$PWD/../WebKit2/Platform \
+    $$PWD/../WebKit2/Platform/CoreIPC \
+    $$PWD/../WebKit2/Shared \
+    $$PWD/../WebKit2/Shared/CoreIPCSupport \
+    $$PWD/../WebKit2/Shared/qt \
+    $$PWD/../WebKit2/UIProcess \
+    $$PWD/../WebKit2/UIProcess/API/C \
+    $$PWD/../WebKit2/UIProcess/API/cpp \
+    $$PWD/../WebKit2/UIProcess/API/cpp/qt \
+    $$PWD/../WebKit2/UIProcess/API/qt \
+    $$PWD/../WebKit2/UIProcess/Launcher \
+    $$PWD/../WebKit2/UIProcess/Plugins \
+    $$PWD/../WebKit2/UIProcess/qt \
+    $$PWD/../WebKit2/WebProcess \
+    $$PWD/../WebKit2/WebProcess/InjectedBundle \
+    $$PWD/../WebKit2/WebProcess/InjectedBundle/API/c \
+    $$PWD/../WebKit2/WebProcess/WebCoreSupport \
+    $$PWD/../WebKit2/WebProcess/WebPage \
+    $$INCLUDEPATH \
+    $$OUTPUT_DIR/include \
+
+HEADERS += \
+    ../WebKit2/Platform/CoreIPC/ArgumentDecoder.h \
+    ../WebKit2/Platform/CoreIPC/ArgumentEncoder.h \
+    ../WebKit2/Platform/CoreIPC/Arguments.h \
+    ../WebKit2/Platform/CoreIPC/Attachment.h \
+    ../WebKit2/Platform/CoreIPC/Connection.h \
+    ../WebKit2/Platform/CoreIPC/CoreIPCMessageKinds.h \
+    ../WebKit2/Platform/CoreIPC/MessageID.h \
+    ../WebKit2/Platform/PlatformProcessIdentifier.h \
+    ../WebKit2/Platform/RunLoop.h \
+    ../WebKit2/Platform/WorkItem.h \
+    ../WebKit2/Platform/WorkQueue.h \
+    ../WebKit2/Shared/CoreIPCSupport/DrawingAreaMessageKinds.h \
+    ../WebKit2/Shared/CoreIPCSupport/DrawingAreaProxyMessageKinds.h \
+    ../WebKit2/Shared/CoreIPCSupport/WebPageMessageKinds.h \
+    ../WebKit2/Shared/CoreIPCSupport/WebPageProxyMessageKinds.h \
+    ../WebKit2/Shared/CoreIPCSupport/WebProcessMessageKinds.h \
+    ../WebKit2/Shared/NotImplemented.h \
+    ../WebKit2/Shared/qt/WebEventFactoryQt.h \
+    ../WebKit2/Shared/WebEventConversion.h \
+    ../WebKit2/Shared/WebEvent.h \
+    ../WebKit2/Shared/WebNavigationDataStore.h \
+    ../WebKit2/Shared/WebPreferencesStore.h \
+    ../WebKit2/UIProcess/API/cpp/WKRetainPtr.h \
+    ../WebKit2/UIProcess/API/cpp/qt/WKStringQt.h \
+    ../WebKit2/UIProcess/API/cpp/qt/WKURLQt.h \
+    ../WebKit2/UIProcess/API/C/WebKit2.h \
+    ../WebKit2/UIProcess/API/C/WKAPICast.h \
+    ../WebKit2/UIProcess/API/C/WKBase.h \
+    ../WebKit2/UIProcess/API/C/WKContext.h \
+    ../WebKit2/UIProcess/API/C/WKContextPrivate.h \
+    ../WebKit2/UIProcess/API/C/WKFrame.h \
+    ../WebKit2/UIProcess/API/C/WKFramePolicyListener.h \
+    ../WebKit2/UIProcess/API/C/WKNavigationData.h \
+    ../WebKit2/UIProcess/API/C/WKPage.h \
+    ../WebKit2/UIProcess/API/C/WKPageNamespace.h \
+    ../WebKit2/UIProcess/API/C/WKPagePrivate.h \
+    ../WebKit2/UIProcess/API/C/WKPreferences.h \
+    ../WebKit2/UIProcess/API/C/WKString.h \
+    ../WebKit2/UIProcess/API/C/WKURL.h \
+    ../WebKit2/UIProcess/API/qt/qgraphicswkview.h \
+    ../WebKit2/UIProcess/API/qt/qwkpage.h \
+    ../WebKit2/UIProcess/API/qt/qwkpage_p.h \
+    ../WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h \
+    ../WebKit2/UIProcess/DrawingAreaProxy.h \
+    ../WebKit2/UIProcess/GenericCallback.h \
+    ../WebKit2/UIProcess/Launcher/ProcessLauncher.h \
+    ../WebKit2/UIProcess/Plugins/PluginInfoStore.h \
+    ../WebKit2/UIProcess/PageClient.h \
+    ../WebKit2/UIProcess/ProcessModel.h \
+    ../WebKit2/UIProcess/API/qt/ClientImpl.h \
+    ../WebKit2/UIProcess/ResponsivenessTimer.h \
+    ../WebKit2/UIProcess/WebContext.h \
+    ../WebKit2/UIProcess/WebContextInjectedBundleClient.h \
+    ../WebKit2/UIProcess/WebFramePolicyListenerProxy.h \
+    ../WebKit2/UIProcess/WebFrameProxy.h \
+    ../WebKit2/UIProcess/WebHistoryClient.h \
+    ../WebKit2/UIProcess/WebLoaderClient.h \
+    ../WebKit2/UIProcess/WebNavigationData.h \
+    ../WebKit2/UIProcess/WebPageNamespace.h \
+    ../WebKit2/UIProcess/WebPageProxy.h \
+    ../WebKit2/UIProcess/WebPolicyClient.h \
+    ../WebKit2/UIProcess/WebPreferences.h \
+    ../WebKit2/UIProcess/WebProcessManager.h \
+    ../WebKit2/UIProcess/WebProcessProxy.h \
+    ../WebKit2/UIProcess/WebUIClient.h \
+    ../WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBase.h \
+    ../WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h \
+    ../WebKit2/WebProcess/InjectedBundle/InjectedBundle.h \
+    ../WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h \
+    ../WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h \
+    ../WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h \
+    ../WebKit2/WebProcess/WebCoreSupport/WebDragClient.h \
+    ../WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h \
+    ../WebKit2/WebProcess/WebCoreSupport/WebErrors.h \
+    ../WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h \
+    ../WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.h \
+    ../WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.h \
+    ../WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.h \
+    ../WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h \
+    ../WebKit2/WebProcess/WebPage/DrawingArea.h \
+    ../WebKit2/WebProcess/WebPage/WebFrame.h \
+    ../WebKit2/WebProcess/WebPage/WebPage.h \
+    ../WebKit2/WebProcess/WebProcess.h \
+
+SOURCES += \
+    ../WebKit2/Platform/CoreIPC/ArgumentDecoder.cpp \
+    ../WebKit2/Platform/CoreIPC/ArgumentEncoder.cpp \
+    ../WebKit2/Platform/CoreIPC/Attachment.cpp \
+    ../WebKit2/Platform/CoreIPC/Connection.cpp \
+    ../WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp \
+    ../WebKit2/Platform/RunLoop.cpp \
+    ../WebKit2/Platform/WorkQueue.cpp \
+    ../WebKit2/Platform/qt/RunLoopQt.cpp \
+    ../WebKit2/Platform/qt/WorkQueueQt.cpp \
+    ../WebKit2/Shared/ImmutableArray.cpp \
+    ../WebKit2/Shared/WebEventConversion.cpp \
+    ../WebKit2/Shared/WebPreferencesStore.cpp \
+    ../WebKit2/Shared/qt/UpdateChunk.cpp \
+    ../WebKit2/Shared/qt/WebEventFactoryQt.cpp \
+    ../WebKit2/UIProcess/API/C/WKContext.cpp \
+    ../WebKit2/UIProcess/API/C/WKFrame.cpp \
+    ../WebKit2/UIProcess/API/C/WKFramePolicyListener.cpp \
+    ../WebKit2/UIProcess/API/C/WKNavigationData.cpp \
+    ../WebKit2/UIProcess/API/C/WKPage.cpp \
+    ../WebKit2/UIProcess/API/C/WKPageNamespace.cpp \
+    ../WebKit2/UIProcess/API/C/WKPreferences.cpp \
+    ../WebKit2/UIProcess/API/C/WKString.cpp \
+    ../WebKit2/UIProcess/API/C/WKURL.cpp \
+    ../WebKit2/UIProcess/API/qt/qgraphicswkview.cpp \
+    ../WebKit2/UIProcess/API/qt/qwkpage.cpp \
+    ../WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp \
+    ../WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp \
+    ../WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp \
+    ../WebKit2/UIProcess/DrawingAreaProxy.cpp \
+    ../WebKit2/UIProcess/Plugins/PluginInfoStore.cpp \
+    ../WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp \
+    ../WebKit2/UIProcess/Launcher/ProcessLauncher.cpp \
+    ../WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp \
+    ../WebKit2/UIProcess/ResponsivenessTimer.cpp \
+    ../WebKit2/UIProcess/WebBackForwardList.cpp \
+    ../WebKit2/UIProcess/WebBackForwardListItem.cpp \
+    ../WebKit2/UIProcess/WebContext.cpp \
+    ../WebKit2/UIProcess/WebContextInjectedBundleClient.cpp \
+    ../WebKit2/UIProcess/WebFramePolicyListenerProxy.cpp \
+    ../WebKit2/UIProcess/WebFrameProxy.cpp \
+    ../WebKit2/UIProcess/WebHistoryClient.cpp \
+    ../WebKit2/UIProcess/WebLoaderClient.cpp \
+    ../WebKit2/UIProcess/WebNavigationData.cpp \
+    ../WebKit2/UIProcess/WebPageNamespace.cpp \
+    ../WebKit2/UIProcess/WebPageProxy.cpp \
+    ../WebKit2/UIProcess/WebPolicyClient.cpp \
+    ../WebKit2/UIProcess/WebPreferences.cpp \
+    ../WebKit2/UIProcess/WebProcessManager.cpp \
+    ../WebKit2/UIProcess/WebProcessProxy.cpp \
+    ../WebKit2/UIProcess/WebUIClient.cpp \
+    ../WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp \
+    ../WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp \
+    ../WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp \
+    ../WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp \
+    ../WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp \
+    ../WebKit2/UIProcess/API/qt/ClientImpl.cpp \
+    ../WebKit2/UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp \
+    ../WebKit2/UIProcess/qt/WebContextQt.cpp \
+    ../WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp \
+    ../WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp \
+    ../WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp \
+    ../WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp \
+    ../WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp \
+    ../WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp \
+    ../WebKit2/WebProcess/WebCoreSupport/WebBackForwardControllerClient.cpp \
+    ../WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.cpp \
+    ../WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp \
+    ../WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp \
+    ../WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp \
+    ../WebKit2/WebProcess/WebPage/DrawingArea.cpp \
+    ../WebKit2/WebProcess/WebPage/WebFrame.cpp \
+    ../WebKit2/WebProcess/WebPage/WebPage.cpp \
+    ../WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp \
+    ../WebKit2/WebProcess/WebPage/qt/ChunkedUpdateDrawingAreaQt.cpp \
+    ../WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp \
+    ../WebKit2/WebProcess/WebProcess.cpp \
+    ../WebKit2/WebProcess/qt/WebProcessMainQt.cpp
+
+INCLUDEPATH = \
+    $$OUTPUT_DIR/WebCore/generated \
+    $$INCLUDEPATH \
+    $$OUPUT_DIR/include
+
+}
+
 symbian {
     shared {
         contains(CONFIG, def_files) {
diff --git a/WebCore/features.pri b/WebCore/features.pri
deleted file mode 100644 (file)
index 978a8c7..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-# Setting up features (enabled/disabled)
-
-CONFIG(minimal) {
-    DEFINES += ENABLE_NETSCAPE_PLUGIN_API=0
-}
-
-## load mobilityconfig if mobility is available
-load(mobilityconfig, true)
-
-contains(DEFINES, ENABLE_SINGLE_THREADED=1) {
-    DEFINES+=ENABLE_DATABASE=0 ENABLE_DOM_STORAGE=0 ENABLE_ICONDATABASE=0 ENABLE_WORKERS=0 ENABLE_SHARED_WORKERS=0
-}
-
-# turn off SQLITE support if we do not have sqlite3 available
-!CONFIG(QTDIR_build):win32-*:!exists( $${SQLITE3SRCDIR}/sqlite3.c ): DEFINES += ENABLE_SQLITE=0 ENABLE_DATABASE=0 ENABLE_WORKERS=0 ENABLE_SHARED_WORKERS=0 ENABLE_ICONDATABASE=0 ENABLE_OFFLINE_WEB_APPLICATIONS=0 ENABLE_DOM_STORAGE=0
-
-!contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=.): DEFINES += ENABLE_JAVASCRIPT_DEBUGGER=1
-!contains(DEFINES, ENABLE_DATABASE=.): DEFINES += ENABLE_DATABASE=1
-!contains(DEFINES, ENABLE_EVENTSOURCE=.): DEFINES += ENABLE_EVENTSOURCE=1
-!contains(DEFINES, ENABLE_OFFLINE_WEB_APPLICATIONS=.): DEFINES += ENABLE_OFFLINE_WEB_APPLICATIONS=1
-!contains(DEFINES, ENABLE_DOM_STORAGE=.): DEFINES += ENABLE_DOM_STORAGE=1
-!contains(DEFINES, ENABLE_ICONDATABASE=.): DEFINES += ENABLE_ICONDATABASE=1
-!contains(DEFINES, ENABLE_CHANNEL_MESSAGING=.): DEFINES += ENABLE_CHANNEL_MESSAGING=1
-!contains(DEFINES, ENABLE_ORIENTATION_EVENTS=.): DEFINES += ENABLE_ORIENTATION_EVENTS=0
-!contains(DEFINES, ENABLE_DIRECTORY_UPLOAD=.): DEFINES += ENABLE_DIRECTORY_UPLOAD=0
-!contains(DEFINES, ENABLE_FILE_SYSTEM=.): DEFINES += ENABLE_FILE_SYSTEM=0
-
-# turn on SQLITE support if any of the dependent features are turned on
-!contains(DEFINES, ENABLE_SQLITE=.) {
-  contains(DEFINES, ENABLE_DATABASE=1)|contains(DEFINES, ENABLE_ICONDATABASE=1)|contains(DEFINES, ENABLE_DOM_STORAGE=1)|contains(DEFINES, ENABLE_OFFLINE_WEB_APPLICATIONS=1) {
-    DEFINES += ENABLE_SQLITE=1
-  } else {
-    DEFINES += ENABLE_SQLITE=0
-  }
-}
-
-!contains(DEFINES, ENABLE_DASHBOARD_SUPPORT=.): DEFINES += ENABLE_DASHBOARD_SUPPORT=0
-!contains(DEFINES, ENABLE_FILTERS=.): DEFINES += ENABLE_FILTERS=1
-!contains(DEFINES, ENABLE_XPATH=.): DEFINES += ENABLE_XPATH=1
-#!contains(DEFINES, ENABLE_XBL=.): DEFINES += ENABLE_XBL=1
-!contains(DEFINES, ENABLE_WCSS=.): DEFINES += ENABLE_WCSS=0
-!contains(DEFINES, ENABLE_WML=.): DEFINES += ENABLE_WML=0
-!contains(DEFINES, ENABLE_SHARED_WORKERS=.): DEFINES += ENABLE_SHARED_WORKERS=1
-!contains(DEFINES, ENABLE_WORKERS=.): DEFINES += ENABLE_WORKERS=1
-!contains(DEFINES, ENABLE_XHTMLMP=.): DEFINES += ENABLE_XHTMLMP=0
-!contains(DEFINES, ENABLE_DATAGRID=.): DEFINES += ENABLE_DATAGRID=0
-!contains(DEFINES, ENABLE_RUBY=.): DEFINES += ENABLE_RUBY=1
-!contains(DEFINES, ENABLE_SANDBOX=.): DEFINES += ENABLE_SANDBOX=1
-!contains(DEFINES, ENABLE_METER_TAG=.): DEFINES += ENABLE_METER_TAG=1
-!contains(DEFINES, ENABLE_PROGRESS_TAG=.): DEFINES += ENABLE_PROGRESS_TAG=1
-!contains(DEFINES, ENABLE_BLOB_SLICE=.): DEFINES += ENABLE_BLOB_SLICE=0
-!contains(DEFINES, ENABLE_NOTIFICATIONS=.): DEFINES += ENABLE_NOTIFICATIONS=1
-!contains(DEFINES, ENABLE_IMAGE_RESIZER=.): DEFINES += ENABLE_IMAGE_RESIZER=0
-!contains(DEFINES, ENABLE_INPUT_SPEECH=.): DEFINES += ENABLE_INPUT_SPEECH=0
-
-greaterThan(QT_MINOR_VERSION, 5) {
-    !contains(DEFINES, ENABLE_3D_RENDERING=.): DEFINES += ENABLE_3D_RENDERING=1
-}
-
-# SVG support
-!contains(DEFINES, ENABLE_SVG=0) {
-    !contains(DEFINES, ENABLE_SVG=.): DEFINES += ENABLE_SVG=1
-    !contains(DEFINES, ENABLE_SVG_FONTS=.): DEFINES += ENABLE_SVG_FONTS=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
-} else {
-    DEFINES += ENABLE_SVG_FONTS=0 ENABLE_SVG_FOREIGN_OBJECT=0 ENABLE_SVG_ANIMATION=0 ENABLE_SVG_AS_IMAGE=0 ENABLE_SVG_USE=0
-}
-
-# HTML5 datalist support
-!contains(DEFINES, ENABLE_DATALIST=.): DEFINES += ENABLE_DATALIST=1
-
-# Tiled Backing Store support
-greaterThan(QT_MINOR_VERSION, 5) {
-    !contains(DEFINES, ENABLE_TILED_BACKING_STORE=.): DEFINES += ENABLE_TILED_BACKING_STORE=1
-}
-
-# Nescape plugins support (NPAPI)
-!contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=.) {
-    unix|win32-*:!embedded:!wince*: {
-        DEFINES += ENABLE_NETSCAPE_PLUGIN_API=1
-    } else {
-        DEFINES += ENABLE_NETSCAPE_PLUGIN_API=0
-    }
-}
-
-# Web Socket support.
-!contains(DEFINES, ENABLE_WEB_SOCKETS=.): DEFINES += ENABLE_WEB_SOCKETS=1
-
-# Web Timing support.
-!contains(DEFINES, ENABLE_WEB_TIMING=.): DEFINES += ENABLE_WEB_TIMING=0
-
-# XSLT support with QtXmlPatterns
-!contains(DEFINES, ENABLE_XSLT=.) {
-    contains(QT_CONFIG, xmlpatterns):DEFINES += ENABLE_XSLT=1
-    else:DEFINES += ENABLE_XSLT=0
-}
-
-# geolocation support if QtMobility exists
-!CONFIG(QTDIR_build):!contains(DEFINES, ENABLE_GEOLOCATION=.) {
-    contains(MOBILITY_CONFIG, location) {
-       DEFINES += ENABLE_GEOLOCATION=1
-    }
-}
-
-# Bearer management is part of Qt 4.7
-# for older version, check for mobility with bearer
-!contains(DEFINES, ENABLE_QT_BEARER=.) {
-     !lessThan(QT_MINOR_VERSION, 7) {
-        DEFINES += ENABLE_QT_BEARER=1
-     } else {
-        contains(MOBILITY_CONFIG, bearer) {
-            DEFINES += ENABLE_QT_BEARER=1
-        }
-    }
-}
-
-# Enable touch event support with Qt 4.6
-!lessThan(QT_MINOR_VERSION, 6): DEFINES += ENABLE_TOUCH_EVENTS=1
-
-# HTML5 Media Support
-# We require QtMultimedia or Phonon
-!contains(DEFINES, ENABLE_VIDEO=.) {
-    DEFINES -= ENABLE_VIDEO=1
-    DEFINES += ENABLE_VIDEO=0
-
-    !lessThan(QT_MINOR_VERSION, 6):contains(MOBILITY_CONFIG, multimedia) {
-        DEFINES -= ENABLE_VIDEO=0
-        DEFINES += ENABLE_VIDEO=1
-    } else:contains(QT_CONFIG, phonon) {
-        DEFINES -= ENABLE_VIDEO=0
-        DEFINES += ENABLE_VIDEO=1
-    }
-}
-
-# Used to compute defaults for the build-webkit script
-CONFIG(compute_defaults) {
-    message($$DEFINES)
-    error("Done computing defaults")
-}
-
-contains(DEFINES, ENABLE_WCSS=1) {
-    contains(DEFINES, ENABLE_XHTMLMP=0) {
-        DEFINES -= ENABLE_XHTMLMP=0
-        DEFINES += ENABLE_XHTMLMP=1
-    }
-}
-
-## Forward enabled feature macros to JavaScript enabled features macros
-FEATURE_DEFINES_JAVASCRIPT = LANGUAGE_JAVASCRIPT=1
-contains(DEFINES, ENABLE_CHANNEL_MESSAGING=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_CHANNEL_MESSAGING=1
-contains(DEFINES, ENABLE_ORIENTATION_EVENTS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_ORIENTATION_EVENTS=1
-contains(DEFINES, ENABLE_DASHBOARD_SUPPORT=0): DASHBOARDSUPPORTCSSPROPERTIES -= $$PWD/css/DashboardSupportCSSPropertyNames.in
-contains(DEFINES, ENABLE_DATAGRID=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATAGRID=1
-contains(DEFINES, ENABLE_EVENTSOURCE=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_EVENTSOURCE=1
-contains(DEFINES, ENABLE_DATABASE=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATABASE=1
-contains(DEFINES, ENABLE_DATALIST=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATALIST=1
-contains(DEFINES, ENABLE_DOM_STORAGE=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_DOM_STORAGE=1
-contains(DEFINES, ENABLE_SHARED_SCRIPT=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SHARED_SCRIPT=1
-contains(DEFINES, ENABLE_WORKERS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WORKERS=1
-contains(DEFINES, ENABLE_SHARED_WORKERS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SHARED_WORKERS=1
-contains(DEFINES, ENABLE_VIDEO=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_VIDEO=1
-contains(DEFINES, ENABLE_XPATH=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_XPATH=1
-contains(DEFINES, ENABLE_XSLT=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_XSLT=1
-contains(DEFINES, ENABLE_XBL=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_XBL=1
-contains(DEFINES, ENABLE_FILTERS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_FILTERS=1
-contains(DEFINES, ENABLE_WCSS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WCSS=1
-contains(DEFINES, ENABLE_WML=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WML=1
-contains(DEFINES, ENABLE_XHTMLMP=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_XHTMLMP=1
-contains(DEFINES, ENABLE_SVG=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG=1
-contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_JAVASCRIPT_DEBUGGER=1
-contains(DEFINES, ENABLE_OFFLINE_WEB_APPLICATIONS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_OFFLINE_WEB_APPLICATIONS=1
-contains(DEFINES, ENABLE_WEB_SOCKETS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WEB_SOCKETS=1
-contains(DEFINES, ENABLE_WEB_TIMING=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WEB_TIMING=1
-contains(DEFINES, ENABLE_TOUCH_EVENTS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_TOUCH_EVENTS=1
-contains(DEFINES, ENABLE_TILED_BACKING_STORE=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_TILED_BACKING_STORE=1
-contains(DEFINES, ENABLE_NOTIFICATIONS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_NOTIFICATIONS=1
-contains(DEFINES, ENABLE_METER_TAG=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_METER_TAG=1
-contains(DEFINES, ENABLE_PROGRESS_TAG=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_PROGRESS_TAG=1
-contains(DEFINES, ENABLE_GEOLOCATION=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_GEOLOCATION=1
index db102c4..a362650 100644 (file)
@@ -3,11 +3,9 @@ CONFIG += ordered
 
 include(WebKit.pri)
 
-SUBDIRS += JavaScriptCore
-webkit2 {
-    SUBDIRS += WebKit2
-}
-SUBDIRS += WebCore
+SUBDIRS += \
+        JavaScriptCore \
+        WebCore
 
 # If the source exists, built it
 exists($$PWD/WebKitTools/QtTestBrowser): SUBDIRS += WebKitTools/QtTestBrowser
@@ -31,7 +29,7 @@ build-qtscript {
 }
 
 webkit2 {
-    exists($$PWD/WebKit2/WebProcess.pro): SUBDIRS += WebKit2/WebProcess.pro
+    exists($$PWD/WebKit2/WebKit2.pro): SUBDIRS += WebKit2/WebKit2.pro
     exists($$PWD/WebKitTools/MiniBrowser/qt/MiniBrowser.pro): SUBDIRS += WebKitTools/MiniBrowser/qt/MiniBrowser.pro
 }
 
index 5c21fb4..e5a71f0 100644 (file)
@@ -1,3 +1,16 @@
+2010-08-07  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r64904.
+        http://trac.webkit.org/changeset/64904
+        https://bugs.webkit.org/show_bug.cgi?id=43671
+
+        Broke the Qt Windows builders. (Requested by bbandix on
+        #webkit).
+
+        * WebKit2.pri: Removed.
+        * WebKit2.pro:
+        * WebProcess.pro: Removed.
+
 2010-08-07  Balazs Kelemen  <kb@inf.u-szeged.hu>
 
         Reviewed by Eric Seidel.
diff --git a/WebKit2/WebKit2.pri b/WebKit2/WebKit2.pri
deleted file mode 100644 (file)
index c9c6e52..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-# WebKit2 - Qt4 build info
-
-# Use a config-specific target to prevent parallel builds file clashes on Mac
-mac: CONFIG(debug, debug|release): WEBKIT2_TARGET = webkit2d
-else: WEBKIT2_TARGET = webkit2
-
-# Output in WebKit2/<config>
-CONFIG(debug, debug|release) : WEBKIT2_DESTDIR = debug
-else: WEBKIT2_DESTDIR = release
-
-defineTest(addWebKit2Lib) {
-    pathToWebKit2Output = $$ARGS/$$WEBKIT2_DESTDIR
-
-    QMAKE_LIBDIR += $$pathToWebKit2Output
-
-    # Make symbols visible
-    QMAKE_LFLAGS += -Wl,-whole-archive -l$$WEBKIT2_TARGET -Wl,-no-whole-archive
-
-    POST_TARGETDEPS += $${pathToWebKit2Output}$${QMAKE_DIR_SEP}lib$${WEBKIT2_TARGET}.a
-
-    # The following line is to prevent qmake from adding webkit2 to libQtWebKit's prl dependencies.
-    CONFIG -= explicitlib
-
-    export(QMAKE_LIBDIR)
-    export(QMAKE_LFLAGS)
-    export(POST_TARGETDEPS)
-    export(CONFIG)
-
-    return(true)
-}
index b338380..2cabb00 100644 (file)
-# WebKit2 - Qt4 build info
+TEMPLATE = app
+TARGET = QtWebProcess
 
-CONFIG += building-libs
-CONFIG += depend_includepath
+SOURCES += \
+    qt/MainQt.cpp
 
-include($$PWD/../common.pri)
-include($$PWD/../WebCore/features.pri)
-include(WebKit2.pri)
+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ..
+include(../WebKit.pri)
 
-TEMPLATE = lib
-CONFIG += staticlib
-TARGET = $$WEBKIT2_TARGET
-DESTDIR = $$WEBKIT2_DESTDIR
-QT += network
+DESTDIR = $$OUTPUT_DIR/bin
+!CONFIG(standalone_package): CONFIG -= app_bundle
 
-!CONFIG(release, debug|release) {
-    OBJECTS_DIR = obj/debug
-} else { # Release
-    OBJECTS_DIR = obj/release
+QT += network
+macx:QT+=xml
+
+linux-* {
+    # From Creator's src/rpath.pri:
+    # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
+    # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var.
+    QMAKE_RPATHDIR = \$\$ORIGIN/../lib $$QMAKE_RPATHDIR
+    MY_RPATH = $$join(QMAKE_RPATHDIR, ":")
+
+    QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\'
+    QMAKE_RPATHDIR =
+} else {
+    QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
 }
 
-INCLUDEPATH = \
-    $$PWD/.. \
-    $$PWD/../JavaScriptCore \
-    $$PWD/../JavaScriptCore/assembler \
-    $$PWD/../JavaScriptCore/bytecode \
-    $$PWD/../JavaScriptCore/bytecompiler \
-    $$PWD/../JavaScriptCore/debugger \
-    $$PWD/../JavaScriptCore/interpreter \
-    $$PWD/../JavaScriptCore/jit \
-    $$PWD/../JavaScriptCore/parser \
-    $$PWD/../JavaScriptCore/pcre \
-    $$PWD/../JavaScriptCore/profiler \
-    $$PWD/../JavaScriptCore/runtime \
-    $$PWD/../JavaScriptCore/wtf \
-    $$PWD/../JavaScriptCore/wtf/symbian \
-    $$PWD/../JavaScriptCore/wtf/unicode \
-    $$PWD/../JavaScriptCore/yarr \
-    $$PWD/../JavaScriptCore/API \
-    $$PWD/../JavaScriptCore/ForwardingHeaders \
-    $$INCLUDEPATH
-
-INCLUDEPATH = \
-    $$PWD/../WebCore \
-    $$PWD/../WebCore/accessibility \
-    $$PWD/../WebCore/bindings \
-    $$PWD/../WebCore/bindings/generic \
-    $$PWD/../WebCore/bindings/js \
-    $$PWD/../WebCore/bridge \
-    $$PWD/../WebCore/bridge/c \
-    $$PWD/../WebCore/bridge/jsc \
-    $$PWD/../WebCore/css \
-    $$PWD/../WebCore/dom \
-    $$PWD/../WebCore/dom/default \
-    $$PWD/../WebCore/editing \
-    $$PWD/../WebCore/history \
-    $$PWD/../WebCore/html \
-    $$PWD/../WebCore/html/canvas \
-    $$PWD/../WebCore/inspector \
-    $$PWD/../WebCore/loader \
-    $$PWD/../WebCore/loader/appcache \
-    $$PWD/../WebCore/loader/archive \
-    $$PWD/../WebCore/loader/icon \
-    $$PWD/../WebCore/mathml \
-    $$PWD/../WebCore/notifications \
-    $$PWD/../WebCore/page \
-    $$PWD/../WebCore/page/animation \
-    $$PWD/../WebCore/platform \
-    $$PWD/../WebCore/platform/animation \
-    $$PWD/../WebCore/platform/graphics \
-    $$PWD/../WebCore/platform/graphics/filters \
-    $$PWD/../WebCore/platform/graphics/transforms \
-    $$PWD/../WebCore/platform/image-decoders \
-    $$PWD/../WebCore/platform/mock \
-    $$PWD/../WebCore/platform/network \
-    $$PWD/../WebCore/platform/sql \
-    $$PWD/../WebCore/platform/text \
-    $$PWD/../WebCore/platform/text/transcoder \
-    $$PWD/../WebCore/plugins \
-    $$PWD/../WebCore/rendering \
-    $$PWD/../WebCore/rendering/style \
-    $$PWD/../WebCore/storage \
-    $$PWD/../WebCore/svg \
-    $$PWD/../WebCore/svg/animation \
-    $$PWD/../WebCore/svg/graphics \
-    $$PWD/../WebCore/svg/graphics/filters \
-    $$PWD/../WebCore/websockets \
-    $$PWD/../WebCore/wml \
-    $$PWD/../WebCore/workers \
-    $$PWD/../WebCore/xml \
-    $$INCLUDEPATH
-
-INCLUDEPATH = \
-    $$PWD/../WebCore/bridge/qt \
-    $$PWD/../WebCore/page/qt \
-    $$PWD/../WebCore/platform/graphics/qt \
-    $$PWD/../WebCore/platform/network/qt \
-    $$PWD/../WebCore/platform/qt \
-    $$PWD/../WebKit/qt/Api \
-    $$PWD/../WebKit/qt/WebCoreSupport \
-    $$INCLUDEPATH
-
-INCLUDEPATH = \
-    Platform \
-    Platform/CoreIPC \
-    Shared \
-    Shared/CoreIPCSupport \
-    Shared/qt \
-    UIProcess \
-    UIProcess/API/C \
-    UIProcess/API/cpp \
-    UIProcess/API/cpp/qt \
-    UIProcess/API/qt \
-    UIProcess/Launcher \
-    UIProcess/Plugins \
-    UIProcess/qt \
-    WebProcess \
-    WebProcess/InjectedBundle \
-    WebProcess/InjectedBundle/API/c \
-    WebProcess/Plugins \
-    WebProcess/WebCoreSupport \
-    WebProcess/WebPage \
-    $$INCLUDEPATH
-
-INCLUDEPATH += \
-    $$OUTPUT_DIR/include \
-    $$OUTPUT_DIR/WebCore/generated
-
-
-PREFIX_HEADER = $$PWD/../WebKit2/WebKit2Prefix.h
-QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
-
-DEFINES += BUILDING_QT__
-
-HEADERS += \
-    ../WebKit2/Platform/CoreIPC/ArgumentDecoder.h \
-    ../WebKit2/Platform/CoreIPC/ArgumentEncoder.h \
-    ../WebKit2/Platform/CoreIPC/Arguments.h \
-    ../WebKit2/Platform/CoreIPC/Attachment.h \
-    ../WebKit2/Platform/CoreIPC/Connection.h \
-    ../WebKit2/Platform/CoreIPC/CoreIPCMessageKinds.h \
-    ../WebKit2/Platform/CoreIPC/MessageID.h \
-    ../WebKit2/Platform/PlatformProcessIdentifier.h \
-    ../WebKit2/Platform/RunLoop.h \
-    ../WebKit2/Platform/WorkItem.h \
-    ../WebKit2/Platform/WorkQueue.h \
-    ../WebKit2/Shared/CoreIPCSupport/DrawingAreaMessageKinds.h \
-    ../WebKit2/Shared/CoreIPCSupport/DrawingAreaProxyMessageKinds.h \
-    ../WebKit2/Shared/CoreIPCSupport/WebPageMessageKinds.h \
-    ../WebKit2/Shared/CoreIPCSupport/WebPageProxyMessageKinds.h \
-    ../WebKit2/Shared/CoreIPCSupport/WebProcessMessageKinds.h \
-    ../WebKit2/Shared/NotImplemented.h \
-    ../WebKit2/Shared/qt/WebEventFactoryQt.h \
-    ../WebKit2/Shared/WebEventConversion.h \
-    ../WebKit2/Shared/WebEvent.h \
-    ../WebKit2/Shared/WebNavigationDataStore.h \
-    ../WebKit2/Shared/WebPreferencesStore.h \
-    ../WebKit2/UIProcess/API/cpp/WKRetainPtr.h \
-    ../WebKit2/UIProcess/API/cpp/qt/WKStringQt.h \
-    ../WebKit2/UIProcess/API/cpp/qt/WKURLQt.h \
-    ../WebKit2/UIProcess/API/C/WebKit2.h \
-    ../WebKit2/UIProcess/API/C/WKAPICast.h \
-    ../WebKit2/UIProcess/API/C/WKBase.h \
-    ../WebKit2/UIProcess/API/C/WKContext.h \
-    ../WebKit2/UIProcess/API/C/WKContextPrivate.h \
-    ../WebKit2/UIProcess/API/C/WKFrame.h \
-    ../WebKit2/UIProcess/API/C/WKFramePolicyListener.h \
-    ../WebKit2/UIProcess/API/C/WKNavigationData.h \
-    ../WebKit2/UIProcess/API/C/WKPage.h \
-    ../WebKit2/UIProcess/API/C/WKPageNamespace.h \
-    ../WebKit2/UIProcess/API/C/WKPagePrivate.h \
-    ../WebKit2/UIProcess/API/C/WKPreferences.h \
-    ../WebKit2/UIProcess/API/C/WKString.h \
-    ../WebKit2/UIProcess/API/C/WKURL.h \
-    ../WebKit2/UIProcess/API/qt/qgraphicswkview.h \
-    ../WebKit2/UIProcess/API/qt/qwkpage.h \
-    ../WebKit2/UIProcess/API/qt/qwkpage_p.h \
-    ../WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h \
-    ../WebKit2/UIProcess/DrawingAreaProxy.h \
-    ../WebKit2/UIProcess/GenericCallback.h \
-    ../WebKit2/UIProcess/Launcher/ProcessLauncher.h \
-    ../WebKit2/UIProcess/Plugins/PluginInfoStore.h \
-    ../WebKit2/UIProcess/PageClient.h \
-    ../WebKit2/UIProcess/ProcessModel.h \
-    ../WebKit2/UIProcess/API/qt/ClientImpl.h \
-    ../WebKit2/UIProcess/ResponsivenessTimer.h \
-    ../WebKit2/UIProcess/WebContext.h \
-    ../WebKit2/UIProcess/WebContextInjectedBundleClient.h \
-    ../WebKit2/UIProcess/WebFramePolicyListenerProxy.h \
-    ../WebKit2/UIProcess/WebFrameProxy.h \
-    ../WebKit2/UIProcess/WebHistoryClient.h \
-    ../WebKit2/UIProcess/WebLoaderClient.h \
-    ../WebKit2/UIProcess/WebNavigationData.h \
-    ../WebKit2/UIProcess/WebPageNamespace.h \
-    ../WebKit2/UIProcess/WebPageProxy.h \
-    ../WebKit2/UIProcess/WebPolicyClient.h \
-    ../WebKit2/UIProcess/WebPreferences.h \
-    ../WebKit2/UIProcess/WebProcessManager.h \
-    ../WebKit2/UIProcess/WebProcessProxy.h \
-    ../WebKit2/UIProcess/WebUIClient.h \
-    ../WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBase.h \
-    ../WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h \
-    ../WebKit2/WebProcess/InjectedBundle/InjectedBundle.h \
-    ../WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h \
-    ../WebKit2/WebProcess/Plugins/JSNPObject.h \
-    ../WebKit2/WebProcess/Plugins/JSNPMethod.h \
-    ../WebKit2/WebProcess/Plugins/NPJSObject.h \
-    ../WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.h \
-    ../WebKit2/WebProcess/Plugins/NPRuntimeUtilities.h \
-    ../WebKit2/WebProcess/Plugins/Plugin.h \
-    ../WebKit2/WebProcess/Plugins/PluginController.h \
-    ../WebKit2/WebProcess/Plugins/PluginView.h \
-    ../WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h \
-    ../WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h \
-    ../WebKit2/WebProcess/WebCoreSupport/WebDragClient.h \
-    ../WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h \
-    ../WebKit2/WebProcess/WebCoreSupport/WebErrors.h \
-    ../WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h \
-    ../WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.h \
-    ../WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.h \
-    ../WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.h \
-    ../WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h \
-    ../WebKit2/WebProcess/WebPage/DrawingArea.h \
-    ../WebKit2/WebProcess/WebPage/WebFrame.h \
-    ../WebKit2/WebProcess/WebPage/WebPage.h \
-    ../WebKit2/WebProcess/WebProcess.h \
+symbian {
+    TARGET.UID3 = 0xA000E543
+    TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices
+}
 
-SOURCES += \
-    ../WebKit2/Platform/CoreIPC/ArgumentDecoder.cpp \
-    ../WebKit2/Platform/CoreIPC/ArgumentEncoder.cpp \
-    ../WebKit2/Platform/CoreIPC/Attachment.cpp \
-    ../WebKit2/Platform/CoreIPC/Connection.cpp \
-    ../WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp \
-    ../WebKit2/Platform/RunLoop.cpp \
-    ../WebKit2/Platform/WorkQueue.cpp \
-    ../WebKit2/Platform/qt/RunLoopQt.cpp \
-    ../WebKit2/Platform/qt/WorkQueueQt.cpp \
-    ../WebKit2/Shared/ImmutableArray.cpp \
-    ../WebKit2/Shared/WebEventConversion.cpp \
-    ../WebKit2/Shared/WebPreferencesStore.cpp \
-    ../WebKit2/Shared/qt/UpdateChunk.cpp \
-    ../WebKit2/Shared/qt/WebEventFactoryQt.cpp \
-    ../WebKit2/UIProcess/API/C/WKContext.cpp \
-    ../WebKit2/UIProcess/API/C/WKFrame.cpp \
-    ../WebKit2/UIProcess/API/C/WKFramePolicyListener.cpp \
-    ../WebKit2/UIProcess/API/C/WKNavigationData.cpp \
-    ../WebKit2/UIProcess/API/C/WKPage.cpp \
-    ../WebKit2/UIProcess/API/C/WKPageNamespace.cpp \
-    ../WebKit2/UIProcess/API/C/WKPreferences.cpp \
-    ../WebKit2/UIProcess/API/C/WKString.cpp \
-    ../WebKit2/UIProcess/API/C/WKURL.cpp \
-    ../WebKit2/UIProcess/API/qt/ClientImpl.cpp \
-    ../WebKit2/UIProcess/API/qt/qgraphicswkview.cpp \
-    ../WebKit2/UIProcess/API/qt/qwkpage.cpp \
-    ../WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp \
-    ../WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp \
-    ../WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp \
-    ../WebKit2/UIProcess/DrawingAreaProxy.cpp \
-    ../WebKit2/UIProcess/Plugins/PluginInfoStore.cpp \
-    ../WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp \
-    ../WebKit2/UIProcess/Launcher/ProcessLauncher.cpp \
-    ../WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp \
-    ../WebKit2/UIProcess/ResponsivenessTimer.cpp \
-    ../WebKit2/UIProcess/WebBackForwardList.cpp \
-    ../WebKit2/UIProcess/WebBackForwardListItem.cpp \
-    ../WebKit2/UIProcess/WebContext.cpp \
-    ../WebKit2/UIProcess/WebContextInjectedBundleClient.cpp \
-    ../WebKit2/UIProcess/WebFramePolicyListenerProxy.cpp \
-    ../WebKit2/UIProcess/WebFrameProxy.cpp \
-    ../WebKit2/UIProcess/WebHistoryClient.cpp \
-    ../WebKit2/UIProcess/WebLoaderClient.cpp \
-    ../WebKit2/UIProcess/WebNavigationData.cpp \
-    ../WebKit2/UIProcess/WebPageNamespace.cpp \
-    ../WebKit2/UIProcess/WebPageProxy.cpp \
-    ../WebKit2/UIProcess/WebPolicyClient.cpp \
-    ../WebKit2/UIProcess/WebPreferences.cpp \
-    ../WebKit2/UIProcess/WebProcessManager.cpp \
-    ../WebKit2/UIProcess/WebProcessProxy.cpp \
-    ../WebKit2/UIProcess/WebUIClient.cpp \
-    ../WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp \
-    ../WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp \
-    ../WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp \
-    ../WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp \
-    ../WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp \
-    ../WebKit2/WebProcess/Plugins/JSNPObject.cpp \
-    ../WebKit2/WebProcess/Plugins/JSNPMethod.cpp \
-    ../WebKit2/WebProcess/Plugins/NPJSObject.cpp \
-    ../WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.cpp \
-    ../WebKit2/WebProcess/Plugins/NPRuntimeUtilities.cpp \
-    ../WebKit2/WebProcess/Plugins/Plugin.cpp \
-    ../WebKit2/WebProcess/Plugins/PluginView.cpp \
-    ../WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp \
-    ../WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp \
-    ../WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp \
-    ../WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp \
-    ../WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp \
-    ../WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp \
-    ../WebKit2/WebProcess/WebCoreSupport/WebBackForwardControllerClient.cpp \
-    ../WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.cpp \
-    ../WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp \
-    ../WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp \
-    ../WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp \
-    ../WebKit2/WebProcess/WebPage/DrawingArea.cpp \
-    ../WebKit2/WebProcess/WebPage/WebFrame.cpp \
-    ../WebKit2/WebProcess/WebPage/WebPage.cpp \
-    ../WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp \
-    ../WebKit2/WebProcess/WebPage/qt/ChunkedUpdateDrawingAreaQt.cpp \
-    ../WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp \
-    ../WebKit2/WebProcess/WebProcess.cpp \
-    ../WebKit2/UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp \
-    ../WebKit2/UIProcess/qt/WebContextQt.cpp \
-    ../WebKit2/WebProcess/qt/WebProcessMainQt.cpp \
+contains(QT_CONFIG, opengl) {
+    QT += opengl
+    DEFINES += QT_CONFIGURED_WITH_OPENGL
+}
diff --git a/WebKit2/WebProcess.pro b/WebKit2/WebProcess.pro
deleted file mode 100644 (file)
index 2cabb00..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-TEMPLATE = app
-TARGET = QtWebProcess
-
-SOURCES += \
-    qt/MainQt.cpp
-
-isEmpty(OUTPUT_DIR): OUTPUT_DIR = ..
-include(../WebKit.pri)
-
-DESTDIR = $$OUTPUT_DIR/bin
-!CONFIG(standalone_package): CONFIG -= app_bundle
-
-QT += network
-macx:QT+=xml
-
-linux-* {
-    # From Creator's src/rpath.pri:
-    # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
-    # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var.
-    QMAKE_RPATHDIR = \$\$ORIGIN/../lib $$QMAKE_RPATHDIR
-    MY_RPATH = $$join(QMAKE_RPATHDIR, ":")
-
-    QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\'
-    QMAKE_RPATHDIR =
-} else {
-    QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
-}
-
-symbian {
-    TARGET.UID3 = 0xA000E543
-    TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices
-}
-
-contains(QT_CONFIG, opengl) {
-    QT += opengl
-    DEFINES += QT_CONFIGURED_WITH_OPENGL
-}