Changeset 64906 in webkit


Ignore:
Timestamp:
Aug 7, 2010 5:22:02 AM (14 years ago)
Author:
abecsi@webkit.org
Message:

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 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.
Location:
trunk
Files:
3 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r64904 r64906  
     12010-08-07  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r64904.
     4        http://trac.webkit.org/changeset/64904
     5        https://bugs.webkit.org/show_bug.cgi?id=43671
     6
     7        Broke the Qt Windows builders. (Requested by bbandix on
     8        #webkit).
     9
     10        * WebKit.pro:
     11
    1122010-08-07  Balazs Kelemen  <kb@inf.u-szeged.hu>
    213
  • trunk/WebCore/ChangeLog

    r64904 r64906  
     12010-08-07  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r64904.
     4        http://trac.webkit.org/changeset/64904
     5        https://bugs.webkit.org/show_bug.cgi?id=43671
     6
     7        Broke the Qt Windows builders. (Requested by bbandix on
     8        #webkit).
     9
     10        * WebCore.pri:
     11        * WebCore.pro:
     12        * features.pri: Removed.
     13
    1142010-08-07  Balazs Kelemen  <kb@inf.u-szeged.hu>
    215
  • trunk/WebCore/WebCore.pri

    r64904 r64906  
    11
    22include(../common.pri)
    3 include(features.pri)
    43
    54CONFIG(standalone_package) {
     
    87    isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = generated
    98}
     9
     10CONFIG(minimal) {
     11  DEFINES += ENABLE_NETSCAPE_PLUGIN_API=0
     12}
     13
     14## load mobilityconfig if mobility is available
     15load(mobilityconfig, true)
     16
     17## Define default features macros for optional components
     18## (look for defs in config.h and included files!)
     19# Try to locate sqlite3 source
     20CONFIG(QTDIR_build) {
     21    SQLITE3SRCDIR = $$QT_SOURCE_TREE/src/3rdparty/sqlite/
     22} else {
     23    SQLITE3SRCDIR = $$(SQLITE3SRCDIR)
     24    isEmpty(SQLITE3SRCDIR) {
     25        SQLITE3SRCDIR = $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/
     26    }
     27}
     28
     29contains(DEFINES, ENABLE_SINGLE_THREADED=1) {
     30    DEFINES+=ENABLE_DATABASE=0 ENABLE_DOM_STORAGE=0 ENABLE_ICONDATABASE=0 ENABLE_WORKERS=0 ENABLE_SHARED_WORKERS=0
     31}
     32
     33# turn off SQLITE support if we do not have sqlite3 available
     34!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
     35
     36!contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=.): DEFINES += ENABLE_JAVASCRIPT_DEBUGGER=1
     37!contains(DEFINES, ENABLE_DATABASE=.): DEFINES += ENABLE_DATABASE=1
     38!contains(DEFINES, ENABLE_EVENTSOURCE=.): DEFINES += ENABLE_EVENTSOURCE=1
     39!contains(DEFINES, ENABLE_OFFLINE_WEB_APPLICATIONS=.): DEFINES += ENABLE_OFFLINE_WEB_APPLICATIONS=1
     40!contains(DEFINES, ENABLE_DOM_STORAGE=.): DEFINES += ENABLE_DOM_STORAGE=1
     41!contains(DEFINES, ENABLE_ICONDATABASE=.): DEFINES += ENABLE_ICONDATABASE=1
     42!contains(DEFINES, ENABLE_CHANNEL_MESSAGING=.): DEFINES += ENABLE_CHANNEL_MESSAGING=1
     43!contains(DEFINES, ENABLE_ORIENTATION_EVENTS=.): DEFINES += ENABLE_ORIENTATION_EVENTS=0
     44!contains(DEFINES, ENABLE_DIRECTORY_UPLOAD=.): DEFINES += ENABLE_DIRECTORY_UPLOAD=0
     45!contains(DEFINES, ENABLE_FILE_SYSTEM=.): DEFINES += ENABLE_FILE_SYSTEM=0
     46
     47# turn on SQLITE support if any of the dependent features are turned on
     48!contains(DEFINES, ENABLE_SQLITE=.) {
     49  contains(DEFINES, ENABLE_DATABASE=1)|contains(DEFINES, ENABLE_ICONDATABASE=1)|contains(DEFINES, ENABLE_DOM_STORAGE=1)|contains(DEFINES, ENABLE_OFFLINE_WEB_APPLICATIONS=1) {
     50    DEFINES += ENABLE_SQLITE=1
     51  } else {
     52    DEFINES += ENABLE_SQLITE=0
     53  }
     54}
     55
     56!contains(DEFINES, ENABLE_DASHBOARD_SUPPORT=.): DEFINES += ENABLE_DASHBOARD_SUPPORT=0
     57!contains(DEFINES, ENABLE_FILTERS=.): DEFINES += ENABLE_FILTERS=1
     58!contains(DEFINES, ENABLE_XPATH=.): DEFINES += ENABLE_XPATH=1
     59#!contains(DEFINES, ENABLE_XBL=.): DEFINES += ENABLE_XBL=1
     60!contains(DEFINES, ENABLE_WCSS=.): DEFINES += ENABLE_WCSS=0
     61!contains(DEFINES, ENABLE_WML=.): DEFINES += ENABLE_WML=0
     62!contains(DEFINES, ENABLE_SHARED_WORKERS=.): DEFINES += ENABLE_SHARED_WORKERS=1
     63!contains(DEFINES, ENABLE_WORKERS=.): DEFINES += ENABLE_WORKERS=1
     64!contains(DEFINES, ENABLE_XHTMLMP=.): DEFINES += ENABLE_XHTMLMP=0
     65!contains(DEFINES, ENABLE_DATAGRID=.): DEFINES += ENABLE_DATAGRID=0
     66!contains(DEFINES, ENABLE_RUBY=.): DEFINES += ENABLE_RUBY=1
     67!contains(DEFINES, ENABLE_SANDBOX=.): DEFINES += ENABLE_SANDBOX=1
     68!contains(DEFINES, ENABLE_METER_TAG=.): DEFINES += ENABLE_METER_TAG=1
     69!contains(DEFINES, ENABLE_PROGRESS_TAG=.): DEFINES += ENABLE_PROGRESS_TAG=1
     70!contains(DEFINES, ENABLE_BLOB=.): DEFINES += ENABLE_BLOB=0
     71!contains(DEFINES, ENABLE_NOTIFICATIONS=.): DEFINES += ENABLE_NOTIFICATIONS=1
     72!contains(DEFINES, ENABLE_IMAGE_RESIZER=.): DEFINES += ENABLE_IMAGE_RESIZER=0
     73!contains(DEFINES, ENABLE_INPUT_SPEECH=.): DEFINES += ENABLE_INPUT_SPEECH=0
     74
     75greaterThan(QT_MINOR_VERSION, 5) {
     76    !contains(DEFINES, ENABLE_3D_RENDERING=.): DEFINES += ENABLE_3D_RENDERING=1
     77}
     78
     79# SVG support
     80!contains(DEFINES, ENABLE_SVG=0) {
     81    !contains(DEFINES, ENABLE_SVG=.): DEFINES += ENABLE_SVG=1
     82    !contains(DEFINES, ENABLE_SVG_FONTS=.): DEFINES += ENABLE_SVG_FONTS=1
     83    !contains(DEFINES, ENABLE_SVG_FOREIGN_OBJECT=.): DEFINES += ENABLE_SVG_FOREIGN_OBJECT=1
     84    !contains(DEFINES, ENABLE_SVG_ANIMATION=.): DEFINES += ENABLE_SVG_ANIMATION=1
     85    !contains(DEFINES, ENABLE_SVG_AS_IMAGE=.): DEFINES += ENABLE_SVG_AS_IMAGE=1
     86    !contains(DEFINES, ENABLE_SVG_USE=.): DEFINES += ENABLE_SVG_USE=1
     87} else {
     88    DEFINES += ENABLE_SVG_FONTS=0 ENABLE_SVG_FOREIGN_OBJECT=0 ENABLE_SVG_ANIMATION=0 ENABLE_SVG_AS_IMAGE=0 ENABLE_SVG_USE=0
     89}
     90
     91# HTML5 datalist support
     92!contains(DEFINES, ENABLE_DATALIST=.): DEFINES += ENABLE_DATALIST=1
     93
     94# Tiled Backing Store support
     95greaterThan(QT_MINOR_VERSION, 5) {
     96    !contains(DEFINES, ENABLE_TILED_BACKING_STORE=.): DEFINES += ENABLE_TILED_BACKING_STORE=1
     97}
     98
     99# Nescape plugins support (NPAPI)
     100!contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=.) {
     101    unix|win32-*:!embedded:!wince*: {
     102        DEFINES += ENABLE_NETSCAPE_PLUGIN_API=1
     103    } else {
     104        DEFINES += ENABLE_NETSCAPE_PLUGIN_API=0
     105    }
     106}
     107
     108# Web Socket support.
     109!contains(DEFINES, ENABLE_WEB_SOCKETS=.): DEFINES += ENABLE_WEB_SOCKETS=1
     110
     111# Web Timing support.
     112!contains(DEFINES, ENABLE_WEB_TIMING=.): DEFINES += ENABLE_WEB_TIMING=0
     113
     114# XSLT support with QtXmlPatterns
     115!contains(DEFINES, ENABLE_XSLT=.) {
     116    contains(QT_CONFIG, xmlpatterns):DEFINES += ENABLE_XSLT=1
     117    else:DEFINES += ENABLE_XSLT=0
     118}
     119
     120# geolocation support if QtMobility exists
     121!CONFIG(QTDIR_build):!contains(DEFINES, ENABLE_GEOLOCATION=.) {
     122    contains(MOBILITY_CONFIG, location) {
     123       DEFINES += ENABLE_GEOLOCATION=1
     124    }
     125}
     126
     127# Bearer management is part of Qt 4.7
     128# for older version, check for mobility with bearer
     129!contains(DEFINES, ENABLE_QT_BEARER=.) {
     130     !lessThan(QT_MINOR_VERSION, 7) {
     131        DEFINES += ENABLE_QT_BEARER=1
     132     } else {
     133        contains(MOBILITY_CONFIG, bearer) {
     134            DEFINES += ENABLE_QT_BEARER=1
     135        }
     136    }
     137}
     138
     139# Enable touch event support with Qt 4.6
     140!lessThan(QT_MINOR_VERSION, 6): DEFINES += ENABLE_TOUCH_EVENTS=1
     141
     142# HTML5 Media Support
     143# We require QtMultimedia or Phonon
     144!contains(DEFINES, ENABLE_VIDEO=.) {
     145    DEFINES -= ENABLE_VIDEO=1
     146    DEFINES += ENABLE_VIDEO=0
     147
     148    !lessThan(QT_MINOR_VERSION, 6):contains(MOBILITY_CONFIG, multimedia) {
     149        DEFINES -= ENABLE_VIDEO=0
     150        DEFINES += ENABLE_VIDEO=1
     151    } else:contains(QT_CONFIG, phonon) {
     152        DEFINES -= ENABLE_VIDEO=0
     153        DEFINES += ENABLE_VIDEO=1
     154    }
     155}
     156
     157# Used to compute defaults for the build-webkit script
     158CONFIG(compute_defaults) {
     159    message($$DEFINES)
     160    error("Done computing defaults")
     161}
     162
     163contains(DEFINES, ENABLE_WCSS=1) {
     164    contains(DEFINES, ENABLE_XHTMLMP=0) {
     165        DEFINES -= ENABLE_XHTMLMP=0
     166        DEFINES += ENABLE_XHTMLMP=1
     167    }
     168}
     169
     170## Forward enabled feature macros to JavaScript enabled features macros
     171FEATURE_DEFINES_JAVASCRIPT = LANGUAGE_JAVASCRIPT=1
     172contains(DEFINES, ENABLE_CHANNEL_MESSAGING=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_CHANNEL_MESSAGING=1
     173contains(DEFINES, ENABLE_ORIENTATION_EVENTS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_ORIENTATION_EVENTS=1
     174contains(DEFINES, ENABLE_DASHBOARD_SUPPORT=0): DASHBOARDSUPPORTCSSPROPERTIES -= $$PWD/css/DashboardSupportCSSPropertyNames.in
     175contains(DEFINES, ENABLE_DATAGRID=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATAGRID=1
     176contains(DEFINES, ENABLE_EVENTSOURCE=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_EVENTSOURCE=1
     177contains(DEFINES, ENABLE_DATABASE=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATABASE=1
     178contains(DEFINES, ENABLE_DATALIST=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATALIST=1
     179contains(DEFINES, ENABLE_DOM_STORAGE=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_DOM_STORAGE=1
     180contains(DEFINES, ENABLE_SHARED_SCRIPT=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SHARED_SCRIPT=1
     181contains(DEFINES, ENABLE_WORKERS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WORKERS=1
     182contains(DEFINES, ENABLE_SHARED_WORKERS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SHARED_WORKERS=1
     183contains(DEFINES, ENABLE_VIDEO=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_VIDEO=1
     184contains(DEFINES, ENABLE_XPATH=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_XPATH=1
     185contains(DEFINES, ENABLE_XSLT=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_XSLT=1
     186contains(DEFINES, ENABLE_XBL=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_XBL=1
     187contains(DEFINES, ENABLE_FILTERS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_FILTERS=1
     188contains(DEFINES, ENABLE_WCSS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WCSS=1
     189contains(DEFINES, ENABLE_WML=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WML=1
     190contains(DEFINES, ENABLE_XHTMLMP=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_XHTMLMP=1
     191contains(DEFINES, ENABLE_SVG=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG=1
     192contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_JAVASCRIPT_DEBUGGER=1
     193contains(DEFINES, ENABLE_OFFLINE_WEB_APPLICATIONS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_OFFLINE_WEB_APPLICATIONS=1
     194contains(DEFINES, ENABLE_WEB_SOCKETS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WEB_SOCKETS=1
     195contains(DEFINES, ENABLE_WEB_TIMING=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WEB_TIMING=1
     196contains(DEFINES, ENABLE_TOUCH_EVENTS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_TOUCH_EVENTS=1
     197contains(DEFINES, ENABLE_TILED_BACKING_STORE=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_TILED_BACKING_STORE=1
     198contains(DEFINES, ENABLE_NOTIFICATIONS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_NOTIFICATIONS=1
     199contains(DEFINES, ENABLE_METER_TAG=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_METER_TAG=1
     200contains(DEFINES, ENABLE_PROGRESS_TAG=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_PROGRESS_TAG=1
     201contains(DEFINES, ENABLE_GEOLOCATION=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_GEOLOCATION=1
    10202
    11203## Derived source generators
  • trunk/WebCore/WebCore.pro

    r64904 r64906  
    155155include($$PWD/../JavaScriptCore/JavaScriptCore.pri)
    156156addJavaScriptCoreLib(../JavaScriptCore)
    157 
    158 webkit2 {
    159     include($$PWD/../WebKit2/WebKit2.pri)
    160     addWebKit2Lib(../WebKit2)
    161 }
    162157
    163158# Extract sources to build from the generator definitions
     
    32243219}
    32253220
     3221webkit2 {
     3222
     3223CONFIG += precompile_header
     3224PRECOMPILED_HEADER = $$PWD/../WebKit2/WebKit2Prefix.h
     3225
     3226INCLUDEPATH = \
     3227    $$PWD/../WebKit2/Platform \
     3228    $$PWD/../WebKit2/Platform/CoreIPC \
     3229    $$PWD/../WebKit2/Shared \
     3230    $$PWD/../WebKit2/Shared/CoreIPCSupport \
     3231    $$PWD/../WebKit2/Shared/qt \
     3232    $$PWD/../WebKit2/UIProcess \
     3233    $$PWD/../WebKit2/UIProcess/API/C \
     3234    $$PWD/../WebKit2/UIProcess/API/cpp \
     3235    $$PWD/../WebKit2/UIProcess/API/cpp/qt \
     3236    $$PWD/../WebKit2/UIProcess/API/qt \
     3237    $$PWD/../WebKit2/UIProcess/Launcher \
     3238    $$PWD/../WebKit2/UIProcess/Plugins \
     3239    $$PWD/../WebKit2/UIProcess/qt \
     3240    $$PWD/../WebKit2/WebProcess \
     3241    $$PWD/../WebKit2/WebProcess/InjectedBundle \
     3242    $$PWD/../WebKit2/WebProcess/InjectedBundle/API/c \
     3243    $$PWD/../WebKit2/WebProcess/WebCoreSupport \
     3244    $$PWD/../WebKit2/WebProcess/WebPage \
     3245    $$INCLUDEPATH \
     3246    $$OUTPUT_DIR/include \
     3247
     3248HEADERS += \
     3249    ../WebKit2/Platform/CoreIPC/ArgumentDecoder.h \
     3250    ../WebKit2/Platform/CoreIPC/ArgumentEncoder.h \
     3251    ../WebKit2/Platform/CoreIPC/Arguments.h \
     3252    ../WebKit2/Platform/CoreIPC/Attachment.h \
     3253    ../WebKit2/Platform/CoreIPC/Connection.h \
     3254    ../WebKit2/Platform/CoreIPC/CoreIPCMessageKinds.h \
     3255    ../WebKit2/Platform/CoreIPC/MessageID.h \
     3256    ../WebKit2/Platform/PlatformProcessIdentifier.h \
     3257    ../WebKit2/Platform/RunLoop.h \
     3258    ../WebKit2/Platform/WorkItem.h \
     3259    ../WebKit2/Platform/WorkQueue.h \
     3260    ../WebKit2/Shared/CoreIPCSupport/DrawingAreaMessageKinds.h \
     3261    ../WebKit2/Shared/CoreIPCSupport/DrawingAreaProxyMessageKinds.h \
     3262    ../WebKit2/Shared/CoreIPCSupport/WebPageMessageKinds.h \
     3263    ../WebKit2/Shared/CoreIPCSupport/WebPageProxyMessageKinds.h \
     3264    ../WebKit2/Shared/CoreIPCSupport/WebProcessMessageKinds.h \
     3265    ../WebKit2/Shared/NotImplemented.h \
     3266    ../WebKit2/Shared/qt/WebEventFactoryQt.h \
     3267    ../WebKit2/Shared/WebEventConversion.h \
     3268    ../WebKit2/Shared/WebEvent.h \
     3269    ../WebKit2/Shared/WebNavigationDataStore.h \
     3270    ../WebKit2/Shared/WebPreferencesStore.h \
     3271    ../WebKit2/UIProcess/API/cpp/WKRetainPtr.h \
     3272    ../WebKit2/UIProcess/API/cpp/qt/WKStringQt.h \
     3273    ../WebKit2/UIProcess/API/cpp/qt/WKURLQt.h \
     3274    ../WebKit2/UIProcess/API/C/WebKit2.h \
     3275    ../WebKit2/UIProcess/API/C/WKAPICast.h \
     3276    ../WebKit2/UIProcess/API/C/WKBase.h \
     3277    ../WebKit2/UIProcess/API/C/WKContext.h \
     3278    ../WebKit2/UIProcess/API/C/WKContextPrivate.h \
     3279    ../WebKit2/UIProcess/API/C/WKFrame.h \
     3280    ../WebKit2/UIProcess/API/C/WKFramePolicyListener.h \
     3281    ../WebKit2/UIProcess/API/C/WKNavigationData.h \
     3282    ../WebKit2/UIProcess/API/C/WKPage.h \
     3283    ../WebKit2/UIProcess/API/C/WKPageNamespace.h \
     3284    ../WebKit2/UIProcess/API/C/WKPagePrivate.h \
     3285    ../WebKit2/UIProcess/API/C/WKPreferences.h \
     3286    ../WebKit2/UIProcess/API/C/WKString.h \
     3287    ../WebKit2/UIProcess/API/C/WKURL.h \
     3288    ../WebKit2/UIProcess/API/qt/qgraphicswkview.h \
     3289    ../WebKit2/UIProcess/API/qt/qwkpage.h \
     3290    ../WebKit2/UIProcess/API/qt/qwkpage_p.h \
     3291    ../WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h \
     3292    ../WebKit2/UIProcess/DrawingAreaProxy.h \
     3293    ../WebKit2/UIProcess/GenericCallback.h \
     3294    ../WebKit2/UIProcess/Launcher/ProcessLauncher.h \
     3295    ../WebKit2/UIProcess/Plugins/PluginInfoStore.h \
     3296    ../WebKit2/UIProcess/PageClient.h \
     3297    ../WebKit2/UIProcess/ProcessModel.h \
     3298    ../WebKit2/UIProcess/API/qt/ClientImpl.h \
     3299    ../WebKit2/UIProcess/ResponsivenessTimer.h \
     3300    ../WebKit2/UIProcess/WebContext.h \
     3301    ../WebKit2/UIProcess/WebContextInjectedBundleClient.h \
     3302    ../WebKit2/UIProcess/WebFramePolicyListenerProxy.h \
     3303    ../WebKit2/UIProcess/WebFrameProxy.h \
     3304    ../WebKit2/UIProcess/WebHistoryClient.h \
     3305    ../WebKit2/UIProcess/WebLoaderClient.h \
     3306    ../WebKit2/UIProcess/WebNavigationData.h \
     3307    ../WebKit2/UIProcess/WebPageNamespace.h \
     3308    ../WebKit2/UIProcess/WebPageProxy.h \
     3309    ../WebKit2/UIProcess/WebPolicyClient.h \
     3310    ../WebKit2/UIProcess/WebPreferences.h \
     3311    ../WebKit2/UIProcess/WebProcessManager.h \
     3312    ../WebKit2/UIProcess/WebProcessProxy.h \
     3313    ../WebKit2/UIProcess/WebUIClient.h \
     3314    ../WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBase.h \
     3315    ../WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h \
     3316    ../WebKit2/WebProcess/InjectedBundle/InjectedBundle.h \
     3317    ../WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h \
     3318    ../WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h \
     3319    ../WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h \
     3320    ../WebKit2/WebProcess/WebCoreSupport/WebDragClient.h \
     3321    ../WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h \
     3322    ../WebKit2/WebProcess/WebCoreSupport/WebErrors.h \
     3323    ../WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h \
     3324    ../WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.h \
     3325    ../WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.h \
     3326    ../WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.h \
     3327    ../WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h \
     3328    ../WebKit2/WebProcess/WebPage/DrawingArea.h \
     3329    ../WebKit2/WebProcess/WebPage/WebFrame.h \
     3330    ../WebKit2/WebProcess/WebPage/WebPage.h \
     3331    ../WebKit2/WebProcess/WebProcess.h \
     3332
     3333SOURCES += \
     3334    ../WebKit2/Platform/CoreIPC/ArgumentDecoder.cpp \
     3335    ../WebKit2/Platform/CoreIPC/ArgumentEncoder.cpp \
     3336    ../WebKit2/Platform/CoreIPC/Attachment.cpp \
     3337    ../WebKit2/Platform/CoreIPC/Connection.cpp \
     3338    ../WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp \
     3339    ../WebKit2/Platform/RunLoop.cpp \
     3340    ../WebKit2/Platform/WorkQueue.cpp \
     3341    ../WebKit2/Platform/qt/RunLoopQt.cpp \
     3342    ../WebKit2/Platform/qt/WorkQueueQt.cpp \
     3343    ../WebKit2/Shared/ImmutableArray.cpp \
     3344    ../WebKit2/Shared/WebEventConversion.cpp \
     3345    ../WebKit2/Shared/WebPreferencesStore.cpp \
     3346    ../WebKit2/Shared/qt/UpdateChunk.cpp \
     3347    ../WebKit2/Shared/qt/WebEventFactoryQt.cpp \
     3348    ../WebKit2/UIProcess/API/C/WKContext.cpp \
     3349    ../WebKit2/UIProcess/API/C/WKFrame.cpp \
     3350    ../WebKit2/UIProcess/API/C/WKFramePolicyListener.cpp \
     3351    ../WebKit2/UIProcess/API/C/WKNavigationData.cpp \
     3352    ../WebKit2/UIProcess/API/C/WKPage.cpp \
     3353    ../WebKit2/UIProcess/API/C/WKPageNamespace.cpp \
     3354    ../WebKit2/UIProcess/API/C/WKPreferences.cpp \
     3355    ../WebKit2/UIProcess/API/C/WKString.cpp \
     3356    ../WebKit2/UIProcess/API/C/WKURL.cpp \
     3357    ../WebKit2/UIProcess/API/qt/qgraphicswkview.cpp \
     3358    ../WebKit2/UIProcess/API/qt/qwkpage.cpp \
     3359    ../WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp \
     3360    ../WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp \
     3361    ../WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp \
     3362    ../WebKit2/UIProcess/DrawingAreaProxy.cpp \
     3363    ../WebKit2/UIProcess/Plugins/PluginInfoStore.cpp \
     3364    ../WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp \
     3365    ../WebKit2/UIProcess/Launcher/ProcessLauncher.cpp \
     3366    ../WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp \
     3367    ../WebKit2/UIProcess/ResponsivenessTimer.cpp \
     3368    ../WebKit2/UIProcess/WebBackForwardList.cpp \
     3369    ../WebKit2/UIProcess/WebBackForwardListItem.cpp \
     3370    ../WebKit2/UIProcess/WebContext.cpp \
     3371    ../WebKit2/UIProcess/WebContextInjectedBundleClient.cpp \
     3372    ../WebKit2/UIProcess/WebFramePolicyListenerProxy.cpp \
     3373    ../WebKit2/UIProcess/WebFrameProxy.cpp \
     3374    ../WebKit2/UIProcess/WebHistoryClient.cpp \
     3375    ../WebKit2/UIProcess/WebLoaderClient.cpp \
     3376    ../WebKit2/UIProcess/WebNavigationData.cpp \
     3377    ../WebKit2/UIProcess/WebPageNamespace.cpp \
     3378    ../WebKit2/UIProcess/WebPageProxy.cpp \
     3379    ../WebKit2/UIProcess/WebPolicyClient.cpp \
     3380    ../WebKit2/UIProcess/WebPreferences.cpp \
     3381    ../WebKit2/UIProcess/WebProcessManager.cpp \
     3382    ../WebKit2/UIProcess/WebProcessProxy.cpp \
     3383    ../WebKit2/UIProcess/WebUIClient.cpp \
     3384    ../WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp \
     3385    ../WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp \
     3386    ../WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp \
     3387    ../WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp \
     3388    ../WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp \
     3389    ../WebKit2/UIProcess/API/qt/ClientImpl.cpp \
     3390    ../WebKit2/UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp \
     3391    ../WebKit2/UIProcess/qt/WebContextQt.cpp \
     3392    ../WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp \
     3393    ../WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp \
     3394    ../WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp \
     3395    ../WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp \
     3396    ../WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp \
     3397    ../WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp \
     3398    ../WebKit2/WebProcess/WebCoreSupport/WebBackForwardControllerClient.cpp \
     3399    ../WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.cpp \
     3400    ../WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp \
     3401    ../WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp \
     3402    ../WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp \
     3403    ../WebKit2/WebProcess/WebPage/DrawingArea.cpp \
     3404    ../WebKit2/WebProcess/WebPage/WebFrame.cpp \
     3405    ../WebKit2/WebProcess/WebPage/WebPage.cpp \
     3406    ../WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp \
     3407    ../WebKit2/WebProcess/WebPage/qt/ChunkedUpdateDrawingAreaQt.cpp \
     3408    ../WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp \
     3409    ../WebKit2/WebProcess/WebProcess.cpp \
     3410    ../WebKit2/WebProcess/qt/WebProcessMainQt.cpp
     3411
     3412INCLUDEPATH = \
     3413    $$OUTPUT_DIR/WebCore/generated \
     3414    $$INCLUDEPATH \
     3415    $$OUPUT_DIR/include
     3416
     3417}
     3418
    32263419symbian {
    32273420    shared {
  • trunk/WebKit.pro

    r64904 r64906  
    44include(WebKit.pri)
    55
    6 SUBDIRS += JavaScriptCore
    7 webkit2 {
    8     SUBDIRS += WebKit2
    9 }
    10 SUBDIRS += WebCore
     6SUBDIRS += \
     7        JavaScriptCore \
     8        WebCore
    119
    1210# If the source exists, built it
     
    3230
    3331webkit2 {
    34     exists($$PWD/WebKit2/WebProcess.pro): SUBDIRS += WebKit2/WebProcess.pro
     32    exists($$PWD/WebKit2/WebKit2.pro): SUBDIRS += WebKit2/WebKit2.pro
    3533    exists($$PWD/WebKitTools/MiniBrowser/qt/MiniBrowser.pro): SUBDIRS += WebKitTools/MiniBrowser/qt/MiniBrowser.pro
    3634}
  • trunk/WebKit2/ChangeLog

    r64905 r64906  
     12010-08-07  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r64904.
     4        http://trac.webkit.org/changeset/64904
     5        https://bugs.webkit.org/show_bug.cgi?id=43671
     6
     7        Broke the Qt Windows builders. (Requested by bbandix on
     8        #webkit).
     9
     10        * WebKit2.pri: Removed.
     11        * WebKit2.pro:
     12        * WebProcess.pro: Removed.
     13
    1142010-08-07  Balazs Kelemen  <kb@inf.u-szeged.hu>
    215
  • trunk/WebKit2/WebKit2.pro

    r64904 r64906  
    1 # WebKit2 - Qt4 build info
     1TEMPLATE = app
     2TARGET = QtWebProcess
    23
    3 CONFIG += building-libs
    4 CONFIG += depend_includepath
     4SOURCES += \
     5    qt/MainQt.cpp
    56
    6 include($$PWD/../common.pri)
    7 include($$PWD/../WebCore/features.pri)
    8 include(WebKit2.pri)
     7isEmpty(OUTPUT_DIR): OUTPUT_DIR = ..
     8include(../WebKit.pri)
    99
    10 TEMPLATE = lib
    11 CONFIG += staticlib
    12 TARGET = $$WEBKIT2_TARGET
    13 DESTDIR = $$WEBKIT2_DESTDIR
     10DESTDIR = $$OUTPUT_DIR/bin
     11!CONFIG(standalone_package): CONFIG -= app_bundle
     12
    1413QT += network
     14macx:QT+=xml
    1515
    16 !CONFIG(release, debug|release) {
    17     OBJECTS_DIR = obj/debug
    18 } else { # Release
    19     OBJECTS_DIR = obj/release
     16linux-* {
     17    # From Creator's src/rpath.pri:
     18    # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
     19    # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var.
     20    QMAKE_RPATHDIR = \$\$ORIGIN/../lib $$QMAKE_RPATHDIR
     21    MY_RPATH = $$join(QMAKE_RPATHDIR, ":")
     22
     23    QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\'
     24    QMAKE_RPATHDIR =
     25} else {
     26    QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
    2027}
    2128
    22 INCLUDEPATH = \
    23     $$PWD/.. \
    24     $$PWD/../JavaScriptCore \
    25     $$PWD/../JavaScriptCore/assembler \
    26     $$PWD/../JavaScriptCore/bytecode \
    27     $$PWD/../JavaScriptCore/bytecompiler \
    28     $$PWD/../JavaScriptCore/debugger \
    29     $$PWD/../JavaScriptCore/interpreter \
    30     $$PWD/../JavaScriptCore/jit \
    31     $$PWD/../JavaScriptCore/parser \
    32     $$PWD/../JavaScriptCore/pcre \
    33     $$PWD/../JavaScriptCore/profiler \
    34     $$PWD/../JavaScriptCore/runtime \
    35     $$PWD/../JavaScriptCore/wtf \
    36     $$PWD/../JavaScriptCore/wtf/symbian \
    37     $$PWD/../JavaScriptCore/wtf/unicode \
    38     $$PWD/../JavaScriptCore/yarr \
    39     $$PWD/../JavaScriptCore/API \
    40     $$PWD/../JavaScriptCore/ForwardingHeaders \
    41     $$INCLUDEPATH
     29symbian {
     30    TARGET.UID3 = 0xA000E543
     31    TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices
     32}
    4233
    43 INCLUDEPATH = \
    44     $$PWD/../WebCore \
    45     $$PWD/../WebCore/accessibility \
    46     $$PWD/../WebCore/bindings \
    47     $$PWD/../WebCore/bindings/generic \
    48     $$PWD/../WebCore/bindings/js \
    49     $$PWD/../WebCore/bridge \
    50     $$PWD/../WebCore/bridge/c \
    51     $$PWD/../WebCore/bridge/jsc \
    52     $$PWD/../WebCore/css \
    53     $$PWD/../WebCore/dom \
    54     $$PWD/../WebCore/dom/default \
    55     $$PWD/../WebCore/editing \
    56     $$PWD/../WebCore/history \
    57     $$PWD/../WebCore/html \
    58     $$PWD/../WebCore/html/canvas \
    59     $$PWD/../WebCore/inspector \
    60     $$PWD/../WebCore/loader \
    61     $$PWD/../WebCore/loader/appcache \
    62     $$PWD/../WebCore/loader/archive \
    63     $$PWD/../WebCore/loader/icon \
    64     $$PWD/../WebCore/mathml \
    65     $$PWD/../WebCore/notifications \
    66     $$PWD/../WebCore/page \
    67     $$PWD/../WebCore/page/animation \
    68     $$PWD/../WebCore/platform \
    69     $$PWD/../WebCore/platform/animation \
    70     $$PWD/../WebCore/platform/graphics \
    71     $$PWD/../WebCore/platform/graphics/filters \
    72     $$PWD/../WebCore/platform/graphics/transforms \
    73     $$PWD/../WebCore/platform/image-decoders \
    74     $$PWD/../WebCore/platform/mock \
    75     $$PWD/../WebCore/platform/network \
    76     $$PWD/../WebCore/platform/sql \
    77     $$PWD/../WebCore/platform/text \
    78     $$PWD/../WebCore/platform/text/transcoder \
    79     $$PWD/../WebCore/plugins \
    80     $$PWD/../WebCore/rendering \
    81     $$PWD/../WebCore/rendering/style \
    82     $$PWD/../WebCore/storage \
    83     $$PWD/../WebCore/svg \
    84     $$PWD/../WebCore/svg/animation \
    85     $$PWD/../WebCore/svg/graphics \
    86     $$PWD/../WebCore/svg/graphics/filters \
    87     $$PWD/../WebCore/websockets \
    88     $$PWD/../WebCore/wml \
    89     $$PWD/../WebCore/workers \
    90     $$PWD/../WebCore/xml \
    91     $$INCLUDEPATH
    92 
    93 INCLUDEPATH = \
    94     $$PWD/../WebCore/bridge/qt \
    95     $$PWD/../WebCore/page/qt \
    96     $$PWD/../WebCore/platform/graphics/qt \
    97     $$PWD/../WebCore/platform/network/qt \
    98     $$PWD/../WebCore/platform/qt \
    99     $$PWD/../WebKit/qt/Api \
    100     $$PWD/../WebKit/qt/WebCoreSupport \
    101     $$INCLUDEPATH
    102 
    103 INCLUDEPATH = \
    104     Platform \
    105     Platform/CoreIPC \
    106     Shared \
    107     Shared/CoreIPCSupport \
    108     Shared/qt \
    109     UIProcess \
    110     UIProcess/API/C \
    111     UIProcess/API/cpp \
    112     UIProcess/API/cpp/qt \
    113     UIProcess/API/qt \
    114     UIProcess/Launcher \
    115     UIProcess/Plugins \
    116     UIProcess/qt \
    117     WebProcess \
    118     WebProcess/InjectedBundle \
    119     WebProcess/InjectedBundle/API/c \
    120     WebProcess/Plugins \
    121     WebProcess/WebCoreSupport \
    122     WebProcess/WebPage \
    123     $$INCLUDEPATH
    124 
    125 INCLUDEPATH += \
    126     $$OUTPUT_DIR/include \
    127     $$OUTPUT_DIR/WebCore/generated
    128 
    129 
    130 PREFIX_HEADER = $$PWD/../WebKit2/WebKit2Prefix.h
    131 QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
    132 
    133 DEFINES += BUILDING_QT__
    134 
    135 HEADERS += \
    136     ../WebKit2/Platform/CoreIPC/ArgumentDecoder.h \
    137     ../WebKit2/Platform/CoreIPC/ArgumentEncoder.h \
    138     ../WebKit2/Platform/CoreIPC/Arguments.h \
    139     ../WebKit2/Platform/CoreIPC/Attachment.h \
    140     ../WebKit2/Platform/CoreIPC/Connection.h \
    141     ../WebKit2/Platform/CoreIPC/CoreIPCMessageKinds.h \
    142     ../WebKit2/Platform/CoreIPC/MessageID.h \
    143     ../WebKit2/Platform/PlatformProcessIdentifier.h \
    144     ../WebKit2/Platform/RunLoop.h \
    145     ../WebKit2/Platform/WorkItem.h \
    146     ../WebKit2/Platform/WorkQueue.h \
    147     ../WebKit2/Shared/CoreIPCSupport/DrawingAreaMessageKinds.h \
    148     ../WebKit2/Shared/CoreIPCSupport/DrawingAreaProxyMessageKinds.h \
    149     ../WebKit2/Shared/CoreIPCSupport/WebPageMessageKinds.h \
    150     ../WebKit2/Shared/CoreIPCSupport/WebPageProxyMessageKinds.h \
    151     ../WebKit2/Shared/CoreIPCSupport/WebProcessMessageKinds.h \
    152     ../WebKit2/Shared/NotImplemented.h \
    153     ../WebKit2/Shared/qt/WebEventFactoryQt.h \
    154     ../WebKit2/Shared/WebEventConversion.h \
    155     ../WebKit2/Shared/WebEvent.h \
    156     ../WebKit2/Shared/WebNavigationDataStore.h \
    157     ../WebKit2/Shared/WebPreferencesStore.h \
    158     ../WebKit2/UIProcess/API/cpp/WKRetainPtr.h \
    159     ../WebKit2/UIProcess/API/cpp/qt/WKStringQt.h \
    160     ../WebKit2/UIProcess/API/cpp/qt/WKURLQt.h \
    161     ../WebKit2/UIProcess/API/C/WebKit2.h \
    162     ../WebKit2/UIProcess/API/C/WKAPICast.h \
    163     ../WebKit2/UIProcess/API/C/WKBase.h \
    164     ../WebKit2/UIProcess/API/C/WKContext.h \
    165     ../WebKit2/UIProcess/API/C/WKContextPrivate.h \
    166     ../WebKit2/UIProcess/API/C/WKFrame.h \
    167     ../WebKit2/UIProcess/API/C/WKFramePolicyListener.h \
    168     ../WebKit2/UIProcess/API/C/WKNavigationData.h \
    169     ../WebKit2/UIProcess/API/C/WKPage.h \
    170     ../WebKit2/UIProcess/API/C/WKPageNamespace.h \
    171     ../WebKit2/UIProcess/API/C/WKPagePrivate.h \
    172     ../WebKit2/UIProcess/API/C/WKPreferences.h \
    173     ../WebKit2/UIProcess/API/C/WKString.h \
    174     ../WebKit2/UIProcess/API/C/WKURL.h \
    175     ../WebKit2/UIProcess/API/qt/qgraphicswkview.h \
    176     ../WebKit2/UIProcess/API/qt/qwkpage.h \
    177     ../WebKit2/UIProcess/API/qt/qwkpage_p.h \
    178     ../WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h \
    179     ../WebKit2/UIProcess/DrawingAreaProxy.h \
    180     ../WebKit2/UIProcess/GenericCallback.h \
    181     ../WebKit2/UIProcess/Launcher/ProcessLauncher.h \
    182     ../WebKit2/UIProcess/Plugins/PluginInfoStore.h \
    183     ../WebKit2/UIProcess/PageClient.h \
    184     ../WebKit2/UIProcess/ProcessModel.h \
    185     ../WebKit2/UIProcess/API/qt/ClientImpl.h \
    186     ../WebKit2/UIProcess/ResponsivenessTimer.h \
    187     ../WebKit2/UIProcess/WebContext.h \
    188     ../WebKit2/UIProcess/WebContextInjectedBundleClient.h \
    189     ../WebKit2/UIProcess/WebFramePolicyListenerProxy.h \
    190     ../WebKit2/UIProcess/WebFrameProxy.h \
    191     ../WebKit2/UIProcess/WebHistoryClient.h \
    192     ../WebKit2/UIProcess/WebLoaderClient.h \
    193     ../WebKit2/UIProcess/WebNavigationData.h \
    194     ../WebKit2/UIProcess/WebPageNamespace.h \
    195     ../WebKit2/UIProcess/WebPageProxy.h \
    196     ../WebKit2/UIProcess/WebPolicyClient.h \
    197     ../WebKit2/UIProcess/WebPreferences.h \
    198     ../WebKit2/UIProcess/WebProcessManager.h \
    199     ../WebKit2/UIProcess/WebProcessProxy.h \
    200     ../WebKit2/UIProcess/WebUIClient.h \
    201     ../WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBase.h \
    202     ../WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h \
    203     ../WebKit2/WebProcess/InjectedBundle/InjectedBundle.h \
    204     ../WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h \
    205     ../WebKit2/WebProcess/Plugins/JSNPObject.h \
    206     ../WebKit2/WebProcess/Plugins/JSNPMethod.h \
    207     ../WebKit2/WebProcess/Plugins/NPJSObject.h \
    208     ../WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.h \
    209     ../WebKit2/WebProcess/Plugins/NPRuntimeUtilities.h \
    210     ../WebKit2/WebProcess/Plugins/Plugin.h \
    211     ../WebKit2/WebProcess/Plugins/PluginController.h \
    212     ../WebKit2/WebProcess/Plugins/PluginView.h \
    213     ../WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h \
    214     ../WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h \
    215     ../WebKit2/WebProcess/WebCoreSupport/WebDragClient.h \
    216     ../WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h \
    217     ../WebKit2/WebProcess/WebCoreSupport/WebErrors.h \
    218     ../WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h \
    219     ../WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.h \
    220     ../WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.h \
    221     ../WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.h \
    222     ../WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h \
    223     ../WebKit2/WebProcess/WebPage/DrawingArea.h \
    224     ../WebKit2/WebProcess/WebPage/WebFrame.h \
    225     ../WebKit2/WebProcess/WebPage/WebPage.h \
    226     ../WebKit2/WebProcess/WebProcess.h \
    227 
    228 SOURCES += \
    229     ../WebKit2/Platform/CoreIPC/ArgumentDecoder.cpp \
    230     ../WebKit2/Platform/CoreIPC/ArgumentEncoder.cpp \
    231     ../WebKit2/Platform/CoreIPC/Attachment.cpp \
    232     ../WebKit2/Platform/CoreIPC/Connection.cpp \
    233     ../WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp \
    234     ../WebKit2/Platform/RunLoop.cpp \
    235     ../WebKit2/Platform/WorkQueue.cpp \
    236     ../WebKit2/Platform/qt/RunLoopQt.cpp \
    237     ../WebKit2/Platform/qt/WorkQueueQt.cpp \
    238     ../WebKit2/Shared/ImmutableArray.cpp \
    239     ../WebKit2/Shared/WebEventConversion.cpp \
    240     ../WebKit2/Shared/WebPreferencesStore.cpp \
    241     ../WebKit2/Shared/qt/UpdateChunk.cpp \
    242     ../WebKit2/Shared/qt/WebEventFactoryQt.cpp \
    243     ../WebKit2/UIProcess/API/C/WKContext.cpp \
    244     ../WebKit2/UIProcess/API/C/WKFrame.cpp \
    245     ../WebKit2/UIProcess/API/C/WKFramePolicyListener.cpp \
    246     ../WebKit2/UIProcess/API/C/WKNavigationData.cpp \
    247     ../WebKit2/UIProcess/API/C/WKPage.cpp \
    248     ../WebKit2/UIProcess/API/C/WKPageNamespace.cpp \
    249     ../WebKit2/UIProcess/API/C/WKPreferences.cpp \
    250     ../WebKit2/UIProcess/API/C/WKString.cpp \
    251     ../WebKit2/UIProcess/API/C/WKURL.cpp \
    252     ../WebKit2/UIProcess/API/qt/ClientImpl.cpp \
    253     ../WebKit2/UIProcess/API/qt/qgraphicswkview.cpp \
    254     ../WebKit2/UIProcess/API/qt/qwkpage.cpp \
    255     ../WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp \
    256     ../WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp \
    257     ../WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp \
    258     ../WebKit2/UIProcess/DrawingAreaProxy.cpp \
    259     ../WebKit2/UIProcess/Plugins/PluginInfoStore.cpp \
    260     ../WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp \
    261     ../WebKit2/UIProcess/Launcher/ProcessLauncher.cpp \
    262     ../WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp \
    263     ../WebKit2/UIProcess/ResponsivenessTimer.cpp \
    264     ../WebKit2/UIProcess/WebBackForwardList.cpp \
    265     ../WebKit2/UIProcess/WebBackForwardListItem.cpp \
    266     ../WebKit2/UIProcess/WebContext.cpp \
    267     ../WebKit2/UIProcess/WebContextInjectedBundleClient.cpp \
    268     ../WebKit2/UIProcess/WebFramePolicyListenerProxy.cpp \
    269     ../WebKit2/UIProcess/WebFrameProxy.cpp \
    270     ../WebKit2/UIProcess/WebHistoryClient.cpp \
    271     ../WebKit2/UIProcess/WebLoaderClient.cpp \
    272     ../WebKit2/UIProcess/WebNavigationData.cpp \
    273     ../WebKit2/UIProcess/WebPageNamespace.cpp \
    274     ../WebKit2/UIProcess/WebPageProxy.cpp \
    275     ../WebKit2/UIProcess/WebPolicyClient.cpp \
    276     ../WebKit2/UIProcess/WebPreferences.cpp \
    277     ../WebKit2/UIProcess/WebProcessManager.cpp \
    278     ../WebKit2/UIProcess/WebProcessProxy.cpp \
    279     ../WebKit2/UIProcess/WebUIClient.cpp \
    280     ../WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp \
    281     ../WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp \
    282     ../WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp \
    283     ../WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp \
    284     ../WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp \
    285     ../WebKit2/WebProcess/Plugins/JSNPObject.cpp \
    286     ../WebKit2/WebProcess/Plugins/JSNPMethod.cpp \
    287     ../WebKit2/WebProcess/Plugins/NPJSObject.cpp \
    288     ../WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.cpp \
    289     ../WebKit2/WebProcess/Plugins/NPRuntimeUtilities.cpp \
    290     ../WebKit2/WebProcess/Plugins/Plugin.cpp \
    291     ../WebKit2/WebProcess/Plugins/PluginView.cpp \
    292     ../WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp \
    293     ../WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp \
    294     ../WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp \
    295     ../WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp \
    296     ../WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp \
    297     ../WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp \
    298     ../WebKit2/WebProcess/WebCoreSupport/WebBackForwardControllerClient.cpp \
    299     ../WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.cpp \
    300     ../WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp \
    301     ../WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp \
    302     ../WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp \
    303     ../WebKit2/WebProcess/WebPage/DrawingArea.cpp \
    304     ../WebKit2/WebProcess/WebPage/WebFrame.cpp \
    305     ../WebKit2/WebProcess/WebPage/WebPage.cpp \
    306     ../WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp \
    307     ../WebKit2/WebProcess/WebPage/qt/ChunkedUpdateDrawingAreaQt.cpp \
    308     ../WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp \
    309     ../WebKit2/WebProcess/WebProcess.cpp \
    310     ../WebKit2/UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp \
    311     ../WebKit2/UIProcess/qt/WebContextQt.cpp \
    312     ../WebKit2/WebProcess/qt/WebProcessMainQt.cpp \
     34contains(QT_CONFIG, opengl) {
     35    QT += opengl
     36    DEFINES += QT_CONFIGURED_WITH_OPENGL
     37}
Note: See TracChangeset for help on using the changeset viewer.