Changeset 79320 in webkit


Ignore:
Timestamp:
Feb 22, 2011 7:14:57 AM (13 years ago)
Author:
abecsi@webkit.org
Message:

2011-02-22 Andras Becsi <​abecsi@webkit.org>

Reviewed by Laszlo Gombos.

[Qt] Redesign the build system
​https://bugs.webkit.org/show_bug.cgi?id=51339

Part 2.

Build WebCore as a static library, compile the WebKit API and WebKit2 API
in a final step and link to WebKit2, WebCore and JSC libraries to fix
linking issues resulting from stripped away symbols.

  • Source/WebKit.pri: Add common include paths
  • Source/WebKit.pro: Add new project file to SUBDIRS

2011-02-22 Andras Becsi <​abecsi@webkit.org>

Reviewed by Laszlo Gombos.

[Qt] Redesign the build system
​https://bugs.webkit.org/show_bug.cgi?id=51339

Part 2.

Build WebCore as a static library, compile the WebKit API and WebKit2 API
in a final step and link to WebKit2, WebCore and JSC libraries to fix
linking issues resulting from stripped away symbols.

  • WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro: Remove superfluous includepaths.

2011-02-22 Andras Becsi <​abecsi@webkit.org>

Reviewed by Laszlo Gombos.

[Qt] Redesign the build system
​https://bugs.webkit.org/show_bug.cgi?id=51339

Part 2.

Build WebCore as a static library, compile the WebKit API and WebKit2 API
in a final step and link to WebKit2, WebCore and JSC libraries to fix
linking issues resulting from stripped away symbols.

2011-02-22 Andras Becsi <​abecsi@webkit.org>

Reviewed by Laszlo Gombos.

[Qt] Redesign the build system
​https://bugs.webkit.org/show_bug.cgi?id=51339

Part 2.

Build WebCore as a static library, compile the WebKit API and WebKit2 API
in a final step and link to WebKit2, WebCore and JSC libraries to fix
linking issues resulting from stripped away symbols.

  • QtWebKit.pro: Added. Project file for the final build step.

2011-02-22 Andras Becsi <​abecsi@webkit.org>

Reviewed by Laszlo Gombos.

[Qt] Redesign the build system
​https://bugs.webkit.org/show_bug.cgi?id=51339

Part 2.

Build WebCore as a static library, compile the WebKit API and WebKit2 API
in a final step and link to WebKit2, WebCore and JSC libraries to fix
linking issues resulting from stripped away symbols.

No new tests needed.

  • WebCore.pri: Add needed rules for handling the static library.
  • WebCore.pro: Reorganize API and linker options to QtWebKit.pro.

2011-02-22 Andras Becsi <​abecsi@webkit.org>

Reviewed by Laszlo Gombos.

[Qt] Redesign the build system
​https://bugs.webkit.org/show_bug.cgi?id=51339

Part 2.

Build WebCore as a static library, compile the WebKit API and WebKit2 API
in a final step and link to WebKit2, WebCore and JSC libraries to fix
linking issues resulting from stripped away symbols.

  • WebKit2.pri: Add include paths.
  • WebKit2.pro: Move include paths to WebKit2.pri and move the API source to WebKit/qt/QtWebKit.pro
Location:
trunk
Files:
1 added
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r79150 r79320  
     12011-02-22  Andras Becsi  <abecsi@webkit.org>
     2
     3        Reviewed by Laszlo Gombos.
     4
     5        [Qt] Redesign the build system
     6        https://bugs.webkit.org/show_bug.cgi?id=51339
     7
     8        Part 2.
     9
     10        Build WebCore as a static library, compile the WebKit API and WebKit2 API
     11        in a final step and link to WebKit2, WebCore and JSC libraries to fix
     12        linking issues resulting from stripped away symbols.
     13
     14        * Source/WebKit.pri: Add common include paths
     15        * Source/WebKit.pro: Add new project file to SUBDIRS
     16
    1172011-02-20  Carlos Garcia Campos  <cgarcia@igalia.com>
    218

  • trunk/Source/JavaScriptCore/ChangeLog

    r79258 r79320  
     12011-02-22  Andras Becsi  <abecsi@webkit.org>
     2
     3        Reviewed by Laszlo Gombos.
     4
     5        [Qt] Redesign the build system
     6        https://bugs.webkit.org/show_bug.cgi?id=51339
     7
     8        Part 2.
     9
     10        Build WebCore as a static library, compile the WebKit API and WebKit2 API
     11        in a final step and link to WebKit2, WebCore and JSC libraries to fix
     12        linking issues resulting from stripped away symbols.
     13
     14        * JavaScriptCore.pri: Remove the workaround.
     15
    1162011-02-21  Adam Roben  <aroben@apple.com>
    217

  • trunk/Source/JavaScriptCore/JavaScriptCore.pri

    r79144 r79320  
    8989        # that can't resolve symbols from QtCore if libjscore comes after.
    9090        QMAKE_LIBDIR = $$pathToJavaScriptCoreOutput $$QMAKE_LIBDIR
    91         webkit2 {
    92             # FIXME Workaround for undefined reference linking issues until the build system gets redesigned
    93             mac: LIBS += -Wl,-all_load -l$$JAVASCRIPTCORE_TARGET -WL,-noall_load
    94             else: LIBS += -Wl,-whole-archive -l$$JAVASCRIPTCORE_TARGET -Wl,-no-whole-archive
    95         } else {
    96             LIBS += -l$$JAVASCRIPTCORE_TARGET
    97         }
     91        LIBS += -l$$JAVASCRIPTCORE_TARGET
    9892        POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}lib$${JAVASCRIPTCORE_TARGET}.a
    9993    }

  • trunk/Source/WebCore/ChangeLog

    r79319 r79320  
     12011-02-22  Andras Becsi  <abecsi@webkit.org>
     2
     3        Reviewed by Laszlo Gombos.
     4
     5        [Qt] Redesign the build system
     6        https://bugs.webkit.org/show_bug.cgi?id=51339
     7
     8        Part 2.
     9
     10        Build WebCore as a static library, compile the WebKit API and WebKit2 API
     11        in a final step and link to WebKit2, WebCore and JSC libraries to fix
     12        linking issues resulting from stripped away symbols.
     13
     14        No new tests needed.
     15
     16        * WebCore.pri: Add needed rules for handling the static library.
     17        * WebCore.pro: Reorganize API and linker options to QtWebKit.pro.
     18
    1192011-02-22  Pavel Podivilov  <podivilov@chromium.org>
    220

  • trunk/Source/WebCore/WebCore.pri

    r78566 r79320  
    44include(features.pri)
    55
     6# Uncomment this to enable Texture Mapper.
     7# CONFIG += texmap
     8
     9QT *= network
     10
    611SOURCE_DIR = $$replace(PWD, /WebCore, "")
    712
     13# Use a config-specific target to prevent parallel builds file clashes on Mac
     14mac: CONFIG(debug, debug|release): WEBCORE_TARGET = webcored
     15else: WEBCORE_TARGET = webcore
     16
     17# Output in WebCore/<config>
     18CONFIG(debug, debug|release) : WEBCORE_DESTDIR = debug
     19else: WEBCORE_DESTDIR = release
     20
    821CONFIG(standalone_package) {
    9     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/generated
     22    isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated
    1023    isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = $$PWD/../JavaScriptCore/generated
    1124
    1225    PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h
    1326} else {
    14     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = generated
     27    isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../WebCore/generated
    1528    isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../JavaScriptCore/generated
    1629
    … …  
    2033        OBJECTS_DIR = obj/release
    2134    }
    22 
    23 }
    24 
    25 # On Symbian PREPEND_INCLUDEPATH is the best way to make sure that WebKit headers
    26 # are included before platform headers.
    27 symbian {
    28     PREPEND_INCLUDEPATH = $$WC_GENERATED_SOURCES_DIR $$PREPEND_INCLUDEPATH
    29 } else {
    30     INCLUDEPATH = $$WC_GENERATED_SOURCES_DIR $$INCLUDEPATH
    31 }
    32 
    33 QT += network
     35}
    3436
    3537V8_DIR = "$$[QT_INSTALL_PREFIX]/src/3rdparty/v8"
    … …  
    131133    $$WEBCORE_INCLUDEPATH
    132134
     135# On Symbian PREPEND_INCLUDEPATH is the best way to make sure that WebKit headers
     136# are included before platform headers.
    133137symbian {
    134     PREPEND_INCLUDEPATH = $$WEBCORE_INCLUDEPATH $$PREPEND_INCLUDEPATH
     138    PREPEND_INCLUDEPATH = $$WEBCORE_INCLUDEPATH $$WC_GENERATED_SOURCES_DIR $$PREPEND_INCLUDEPATH
    135139} else {
    136 
    137     INCLUDEPATH = $$WEBCORE_INCLUDEPATH $$INCLUDEPATH
     140    INCLUDEPATH = $$WEBCORE_INCLUDEPATH $$WC_GENERATED_SOURCES_DIR $$INCLUDEPATH
     141}
     142
     143symbian {
     144    v8 {
     145        webkitlibs.sources += v8.dll
     146        QMAKE_CXXFLAGS.ARMCC += -OTime -O3
     147        QMAKE_CXXFLAGS.ARMCC += --fpu softvfp+vfpv2 --fpmode fast
     148    }
     149
     150    symbian-abld|symbian-sbsv2 {
     151        # RO text (code) section in qtwebkit.dll exceeds allocated space for gcce udeb target.
     152        # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000.
     153        QMAKE_LFLAGS.ARMCC += --rw-base 0xE00000
     154        MMP_RULES += ALWAYS_BUILD_AS_ARM
     155    }  else {
     156        QMAKE_CFLAGS -= --thumb
     157        QMAKE_CXXFLAGS -= --thumb
     158    }
     159
     160    CONFIG(release, debug|release): QMAKE_CXXFLAGS.ARMCC += -OTime -O3
     161
     162    !CONFIG(production):CONFIG-=def_files
     163}
     164
     165contains(DEFINES, ENABLE_XSLT=1) {
     166    QT *= xmlpatterns
     167}
     168
     169contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {
     170    unix:!symbian {
     171        mac {
     172            INCLUDEPATH += platform/mac
     173            # Note: XP_MACOSX is defined in npapi.h
     174        } else {
     175            maemo5 {
     176                DEFINES += MOZ_PLATFORM_MAEMO=5
     177            }
     178            contains(DEFINES, Q_WS_MAEMO_6) {
     179                DEFINES += MOZ_PLATFORM_MAEMO=6
     180            }
     181            DEFINES += XP_UNIX
     182            DEFINES += ENABLE_NETSCAPE_PLUGIN_METADATA_CACHE=1
     183        }
     184    }
     185}
     186
     187contains(DEFINES, ENABLE_GEOLOCATION=1) {
     188    CONFIG *= mobility
     189    MOBILITY *= location
     190}
     191
     192contains(DEFINES, ENABLE_DEVICE_ORIENTATION=1) {
     193    CONFIG *= mobility
     194    MOBILITY *= sensors
     195}
     196
     197contains(DEFINES, ENABLE_QT_BEARER=1) {
     198    # Bearer management is part of Qt 4.7, so don't accidentially
     199    # pull in Qt Mobility when building against >= 4.7
     200    !greaterThan(QT_MINOR_VERSION, 6) {
     201        CONFIG *= mobility
     202        MOBILITY *= bearer
     203    }
     204}
     205
     206contains(DEFINES, ENABLE_VIDEO=1) {
     207    contains(DEFINES, USE_GSTREAMER=1) {
     208        DEFINES += WTF_USE_GSTREAMER=1
     209        DEFINES += ENABLE_GLIB_SUPPORT=1
     210
     211        INCLUDEPATH += $$PWD/platform/graphics/gstreamer
     212
     213        PKGCONFIG += glib-2.0 gio-2.0 gstreamer-0.10 gstreamer-app-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gstreamer-plugins-base-0.10 gstreamer-video-0.10
     214    } else:contains(MOBILITY_CONFIG, multimedia) {
     215        CONFIG   *= mobility
     216        MOBILITY *= multimedia
     217        DEFINES  += WTF_USE_QT_MULTIMEDIA=1
     218    } else:contains(QT_CONFIG, phonon) {
     219        # Add phonon manually to prevent it from coming first in
     220        # the include paths, as Phonon's path.h conflicts with
     221        # WebCore's Path.h on case-insensitive filesystems.
     222        qtAddLibrary(phonon)
     223        INCLUDEPATH -= $$QT.phonon.includes
     224        INCLUDEPATH += $$QT.phonon.includes
     225        mac {
     226            INCLUDEPATH -= $$QT.phonon.libs/phonon.framework/Headers
     227            INCLUDEPATH += $$QT.phonon.libs/phonon.framework/Headers
     228        }
     229    }
     230}
     231
     232contains(DEFINES, ENABLE_WEBGL=1)|contains(CONFIG, texmap) {
     233    !contains(QT_CONFIG, opengl) {
     234        error( "This configuration needs an OpenGL enabled Qt. Your Qt is missing OpenGL.")
     235    }
     236    QT *= opengl
    138237}
    139238
    140239contains(QT_CONFIG, qpa):CONFIG += embedded
    141240
     241!CONFIG(webkit-debug):CONFIG(QTDIR_build) {
     242    # Remove the following 2 lines if you want debug information in WebCore
     243    CONFIG -= separate_debug_info
     244    CONFIG += no_debug_info
     245}
     246
     247unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
     248unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
     249linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
     250
     251unix:!mac:!symbian:CONFIG += link_pkgconfig
     252
     253# Disable C++0x mode in WebCore for those who enabled it in their Qt's mkspec
     254*-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x
     255
     256# Remove whole program optimizations due to miscompilations
     257win32-msvc2005|win32-msvc2008|wince*:{
     258    QMAKE_CFLAGS_RELEASE -= -GL
     259    QMAKE_CXXFLAGS_RELEASE -= -GL
     260
     261    # Disable incremental linking for windows 32bit OS debug build as WebKit is so big
     262    # that linker failes to link incrementally in debug mode.
     263    ARCH = $$(PROCESSOR_ARCHITECTURE)
     264    WOW64ARCH = $$(PROCESSOR_ARCHITEW6432)
     265    equals(ARCH, x86):{
     266        isEmpty(WOW64ARCH): QMAKE_LFLAGS_DEBUG += /INCREMENTAL:NO
     267    }
     268}
     269
    142270enable_fast_mobile_scrolling: DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1
    143271
    144272use_qt_mobile_theme: DEFINES += WTF_USE_QT_MOBILE_THEME=1
     273
     274defineTest(addWebCoreLib) {
     275    pathToWebCoreOutput = $$ARGS/$$WEBCORE_DESTDIR
     276    QMAKE_LIBDIR += $$pathToWebCoreOutput
     277    POST_TARGETDEPS += $${pathToWebCoreOutput}$${QMAKE_DIR_SEP}lib$${WEBCORE_TARGET}.a
     278    CONFIG -= explicitlib
     279    export(QMAKE_LIBDIR)
     280    export(POST_TARGETDEPS)
     281    export(CONFIG)
     282    LIBS = -l$$WEBCORE_TARGET $$LIBS
     283    export(LIBS)
     284    return(true)
     285}

  • trunk/Source/WebCore/WebCore.pro

    r79226 r79320  
    33CONFIG += depend_includepath
    44
    5 symbian: {
    6     TARGET.EPOCALLOWDLLDATA=1
    7     # DRM and Allfiles capabilites need to be audited to be signed on Symbian
    8     # For regular users that is not possible, so use the CONFIG(production) flag is added
    9     # To use all capabilies add CONFIG+=production
    10     # If building from QT source tree, also add CONFIG-=QTDIR_build as qbase.pri defaults capabilities to All -Tcb.   
    11     CONFIG(production) {
    12         TARGET.CAPABILITY = All -Tcb
    13     } else {
    14         TARGET.CAPABILITY = All -Tcb -DRM -AllFiles
    15     }
    16     isEmpty(QT_LIBINFIX) {
    17         TARGET.UID3 = 0x200267C2
    18     } else {
    19         TARGET.UID3 = 0xE00267C2
    20     }
    21     webkitlibs.sources = QtWebKit$${QT_LIBINFIX}.dll
    22     v8 {
    23         webkitlibs.sources += v8.dll
    24         QMAKE_CXXFLAGS.ARMCC += -OTime -O3
    25         QMAKE_CXXFLAGS.ARMCC += --fpu softvfp+vfpv2 --fpmode fast
    26         LIBS += -llibpthread
    27     }
    28 
    29     CONFIG(QTDIR_build): webkitlibs.sources = $$QMAKE_LIBDIR_QT/$$webkitlibs.sources
    30     webkitlibs.path = /sys/bin
    31     vendorinfo = \
    32         "; Localised Vendor name" \
    33         "%{\"Nokia\"}" \
    34         " " \
    35         "; Unique Vendor name" \
    36         ":\"Nokia, Qt\"" \
    37         " "
    38     webkitlibs.pkg_prerules = vendorinfo
    39 
    40     webkitbackup.sources = ../WebKit/qt/symbian/backup_registration.xml
    41     webkitbackup.path = /private/10202D56/import/packages/$$replace(TARGET.UID3, 0x,)
    42 
    43     contains(QT_CONFIG, declarative) {
    44          declarativeImport.sources = $$QT_BUILD_TREE/imports/QtWebKit/qmlwebkitplugin$${QT_LIBINFIX}.dll
    45          declarativeImport.sources += ../WebKit/qt/declarative/qmldir
    46          declarativeImport.path = c:$$QT_IMPORTS_BASE_DIR/QtWebKit
    47          DEPLOYMENT += declarativeImport
    48     }
    49 
    50     DEPLOYMENT += webkitlibs webkitbackup
    51 
    52     symbian-abld|symbian-sbsv2 {
    53         # RO text (code) section in qtwebkit.dll exceeds allocated space for gcce udeb target.
    54         # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000.
    55         QMAKE_LFLAGS.ARMCC += --rw-base 0xE00000
    56         MMP_RULES += ALWAYS_BUILD_AS_ARM
    57     }  else {
    58         QMAKE_CFLAGS -= --thumb
    59         QMAKE_CXXFLAGS -= --thumb
    60     }
    61     CONFIG(release, debug|release): QMAKE_CXXFLAGS.ARMCC += -OTime -O3
    62 
    63     !CONFIG(production):CONFIG-=def_files
    64 }
    65 
    665isEmpty(OUTPUT_DIR): OUTPUT_DIR = ..
    676include($$PWD/WebCore.pri)
    687include($$PWD/../WebKit.pri)
     8include($$PWD/../JavaScriptCore/JavaScriptCore.pri)
    699
    7010TEMPLATE = lib
    71 TARGET = QtWebKit
    72 
    73 CONFIG(QTDIR_build) {
    74     include($$QT_SOURCE_TREE/src/qbase.pri)
    75 } else {
    76     DESTDIR = $$OUTPUT_DIR/lib
    77     !static: DEFINES += QT_MAKEDLL
    78     symbian: TARGET =$$TARGET$${QT_LIBINFIX}
    79 }
    80 moduleFile=$$PWD/../WebKit/qt/qt_webkit_version.pri
    81 isEmpty(QT_BUILD_TREE):include($$moduleFile)
    82 VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$${QT_WEBKIT_MINOR_VERSION}.$${QT_WEBKIT_PATCH_VERSION}
    83 
    84 unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork
    85 
    86 unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
    87 unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
    88 linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
    89 
    90 CONFIG(release):!CONFIG(standalone_package) {
    91     contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
    92     unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
    93 }
    94 
    95 DEFINES += BUILDING_WEBKIT
    96 
    97 # Remove whole program optimizations due to miscompilations
    98 win32-msvc2005|win32-msvc2008|wince*:{
    99     QMAKE_CFLAGS_RELEASE -= -GL
    100     QMAKE_CXXFLAGS_RELEASE -= -GL
    101 
    102     # Disable incremental linking for windows 32bit OS debug build as WebKit is so big
    103     # that linker failes to link incrementally in debug mode.
    104     ARCH = $$(PROCESSOR_ARCHITECTURE)
    105     WOW64ARCH = $$(PROCESSOR_ARCHITEW6432)
    106     equals(ARCH, x86):{
    107         isEmpty(WOW64ARCH): QMAKE_LFLAGS_DEBUG += /INCREMENTAL:NO
    108     }
    109 }
    110 
    111 # Pick up 3rdparty libraries from INCLUDE/LIB just like with MSVC
    112 win32-g++* {
    113     TMPPATH            = $$quote($$(INCLUDE))
    114     QMAKE_INCDIR_POST += $$split(TMPPATH,";")
    115     TMPPATH            = $$quote($$(LIB))
    116     QMAKE_LIBDIR_POST += $$split(TMPPATH,";")
    117 }
    118 
    119 symbian {
    120     !CONFIG(QTDIR_build) {
    121         # Test if symbian OS comes with sqlite
    122         exists($${EPOCROOT}epoc32/release/armv5/lib/sqlite3.dso):CONFIG *= system-sqlite
    123     } else:!symbian-abld:!symbian-sbsv2 {
    124         # When bundled with Qt, all Symbian build systems extract their own sqlite files if
    125         # necessary, but on non-mmp based ones we need to specify this ourselves.
    126         include($$QT_SOURCE_TREE/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri)
    127     }
    128 }
     11TARGET = $$WEBCORE_TARGET
     12CONFIG += staticlib
     13
     14DESTDIR = $$WEBCORE_DESTDIR
    12915
    13016RESOURCES += \
    … …  
    13723}
    13824
    139 include($$PWD/../JavaScriptCore/JavaScriptCore.pri)
    140 !v8: addJavaScriptCoreLib(../JavaScriptCore)
    141 
    142 webkit2 {
    143     include($$PWD/../WebKit2/WebKit2.pri)
    144     addWebKit2LibWholeArchive(../WebKit2)
    145 }
    146 
    147 # Extract sources to build from the generator definitions
    148 defineTest(addExtraCompiler) {
    149     isEqual($${1}.wkAddOutputToSources, false): return(true)
    150 
    151     outputRule = $$eval($${1}.output)
    152     input = $$eval($${1}.input)
    153     input = $$eval($$input)
    154 
    155     for(file,input) {
    156         base = $$basename(file)
    157         base ~= s/\\..+//
    158         newfile=$$replace(outputRule,\\$\\{QMAKE_FILE_BASE\\},$$base)
    159         SOURCES += $$newfile
    160     }
    161     SOURCES += $$eval($${1}.wkExtraSources)
    162     export(SOURCES)
    163 
    164     return(true)
    165 }
    166 include(CodeGenerators.pri)
    167 
    16825DASHBOARDSUPPORTCSSPROPERTIES = $$PWD/css/DashboardSupportCSSPropertyNames.in
    169 
    17026
    17127contains(DEFINES, ENABLE_SVG=1) {
    … …  
    21167
    21268    SOURCES += \
     69        platform/qt/PlatformBridgeQt.cpp \
    21370        bindings/generic/BindingSecurityBase.cpp \
    21471        \
    … …  
    21875        bindings/v8/custom/V8PopStateEventCustom.cpp \
    21976        bindings/v8/ScriptGCEvent.cpp
    220 
    22177
    22278    SOURCES += \
    … …  
    246102        bindings/ScriptControllerBase.cpp \
    247103        bindings/v8/ScriptController.cpp \
     104        bindings/v8/ScriptControllerQt.cpp \
    248105        bindings/v8/ScriptEventListener.cpp \
    249106        bindings/v8/ScriptFunctionCall.cpp \
    … …  
    492349        bindings/js/ScriptCallStackFactory.cpp \
    493350        bindings/js/ScriptController.cpp \
     351        bindings/js/ScriptControllerQt.cpp \
    494352        bindings/js/ScriptDebugServer.cpp \
    495353        bindings/js/ScriptEventListener.cpp \
    … …  
    510368        bridge/jsc/BridgeJSC.cpp \
    511369        bridge/npruntime.cpp \
     370        bridge/qt/qt_class.cpp \
     371        bridge/qt/qt_instance.cpp \
     372        bridge/qt/qt_pixmapruntime.cpp \
     373        bridge/qt/qt_runtime.cpp \
    512374        bridge/runtime_array.cpp \
    513375        bridge/runtime_method.cpp \
    … …  
    12881150    xml/XMLHttpRequestProgressEventThrottle.cpp \
    12891151    xml/XMLHttpRequestUpload.cpp \
    1290     xml/XMLSerializer.cpp 
     1152    xml/XMLSerializer.cpp
    12911153
    12921154HEADERS += \
    … …  
    21001962    platform/network/ResourceRequestBase.h \
    21011963    platform/network/ResourceResponseBase.h \
     1964    platform/network/qt/DnsPrefetchHelper.h \
    21021965    platform/PlatformTouchEvent.h \
    21031966    platform/PlatformTouchPoint.h \
    … …  
    25772440    xml/XSLTExtensions.h \
    25782441    xml/XSLTProcessor.h \
    2579     xml/XSLTUnicodeSort.h \
    2580     $$PWD/../WebKit/qt/Api/qwebplugindatabase_p.h \
    2581     $$PWD/../WebKit/qt/WebCoreSupport/InspectorServerQt.h \
    2582     $$PWD/../WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h \
    2583     $$PWD/../WebKit/qt/WebCoreSupport/ChromeClientQt.h \
    2584     $$PWD/../WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h \
    2585     $$PWD/../WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.h \
    2586     $$PWD/../WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.h \
    2587     $$PWD/../WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.h \
    2588     $$PWD/../WebKit/qt/WebCoreSupport/PageClientQt.h \
    2589     $$PWD/../WebKit/qt/WebCoreSupport/QtPlatformPlugin.h \
    2590     $$PWD/../WebKit/qt/WebCoreSupport/PopupMenuQt.h \
    2591     $$PWD/../WebKit/qt/WebCoreSupport/SearchPopupMenuQt.h \
    2592     $$PWD/../WebKit/qt/WebCoreSupport/WebPlatformStrategies.h \
    2593     $$PWD/platform/network/qt/DnsPrefetchHelper.h
    2594 
    2595 v8 {
    2596     SOURCES += \
    2597        bindings/v8/ScriptControllerQt.cpp \
    2598        platform/qt/PlatformBridgeQt.cpp
    2599 } else {
    2600     SOURCES += \
    2601        bindings/js/ScriptControllerQt.cpp \
    2602        bridge/qt/qt_class.cpp \
    2603        bridge/qt/qt_instance.cpp \
    2604        bridge/qt/qt_pixmapruntime.cpp \
    2605        bridge/qt/qt_runtime.cpp
    2606 }
     2442    xml/XSLTUnicodeSort.h
    26072443
    26082444SOURCES += \
    … …  
    26772513    platform/text/qt/TextCodecQt.cpp \
    26782514    platform/qt/WheelEventQt.cpp \
    2679     platform/qt/WidgetQt.cpp \
    2680     ../WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp \
    2681     ../WebKit/qt/WebCoreSupport/ChromeClientQt.cpp \
    2682     ../WebKit/qt/WebCoreSupport/ContextMenuClientQt.cpp \
    2683     ../WebKit/qt/WebCoreSupport/DragClientQt.cpp \
    2684     ../WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp \
    2685     ../WebKit/qt/WebCoreSupport/EditorClientQt.cpp \
    2686     ../WebKit/qt/WebCoreSupport/EditCommandQt.cpp \
    2687     ../WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp \
    2688     ../WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp \
    2689     ../WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.cpp \
    2690     ../WebKit/qt/WebCoreSupport/InspectorClientQt.cpp \
    2691     ../WebKit/qt/WebCoreSupport/InspectorServerQt.cpp \
    2692     ../WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp \
    2693     ../WebKit/qt/WebCoreSupport/PageClientQt.cpp \
    2694     ../WebKit/qt/WebCoreSupport/PopupMenuQt.cpp \
    2695     ../WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp \
    2696     ../WebKit/qt/WebCoreSupport/SearchPopupMenuQt.cpp \
    2697     ../WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp \
    2698     ../WebKit/qt/Api/qwebframe.cpp \
    2699     ../WebKit/qt/Api/qgraphicswebview.cpp \
    2700     ../WebKit/qt/Api/qwebpage.cpp \
    2701     ../WebKit/qt/Api/qwebview.cpp \
    2702     ../WebKit/qt/Api/qwebelement.cpp \
    2703     ../WebKit/qt/Api/qwebhistory.cpp \
    2704     ../WebKit/qt/Api/qwebsettings.cpp \
    2705     ../WebKit/qt/Api/qwebhistoryinterface.cpp \
    2706     ../WebKit/qt/Api/qwebplugindatabase.cpp \
    2707     ../WebKit/qt/Api/qwebpluginfactory.cpp \
    2708     ../WebKit/qt/Api/qwebsecurityorigin.cpp \
    2709     ../WebKit/qt/Api/qwebscriptworld.cpp \
    2710     ../WebKit/qt/Api/qwebdatabase.cpp \
    2711     ../WebKit/qt/Api/qwebinspector.cpp \
    2712     ../WebKit/qt/Api/qwebkitversion.cpp
     2515    platform/qt/WidgetQt.cpp
     2516
    27132517
    27142518contains(DEFINES, WTF_USE_QT_MOBILE_THEME=1) {
    27152519    HEADERS += platform/qt/QtMobileWebStyle.h
    27162520    SOURCES += platform/qt/QtMobileWebStyle.cpp
    2717 }
    2718 
    2719 maemo5 {
    2720     HEADERS += ../WebKit/qt/WebCoreSupport/QtMaemoWebPopup.h
    2721     SOURCES += ../WebKit/qt/WebCoreSupport/QtMaemoWebPopup.cpp
    27222521}
    27232522
    … …  
    27392538        platform/text/cf/StringCF.cpp \
    27402539        platform/text/cf/StringImplCF.cpp
    2741     LIBS_PRIVATE += -framework Carbon -framework AppKit
    2742 }
    2743 
    2744 win32-* {
    2745     LIBS += -lgdi32
    2746     LIBS += -lole32
    2747     LIBS += -luser32
    2748 }
    2749 
    2750 wince* {
    2751     LIBS += -lmmtimer
    2752     LIBS += -lole32
    27532540}
    27542541
    27552542contains (CONFIG, text_breaking_with_icu) {
    27562543    SOURCES += platform/text/TextBreakIteratorICU.cpp
    2757     LIBS += -licuuc
    27582544}
    27592545
    … …  
    27622548        plugins/symbian/PluginDatabaseSymbian.cpp \
    27632549        plugins/symbian/PluginPackageSymbian.cpp
    2764 
    2765     LIBS += -lefsrv
    27662550}
    27672551
    … …  
    27702554    SOURCES += plugins/npapi.cpp
    27712555
    2772     symbian {
    2773         SOURCES += \
    2774         plugins/symbian/PluginViewSymbian.cpp \
    2775         plugins/symbian/PluginContainerSymbian.cpp
    2776 
    2777         HEADERS += \
    2778         plugins/symbian/PluginContainerSymbian.h \
    2779         plugins/symbian/npinterface.h
    2780 
    2781     } else {
    2782 
    2783         unix {
    2784    
    2785             mac {
    2786                 SOURCES += \
    2787                     plugins/mac/PluginPackageMac.cpp
    2788                 OBJECTIVE_SOURCES += \
    2789                     platform/text/mac/StringImplMac.mm \
    2790                     platform/mac/WebCoreNSStringExtras.mm \
    2791                     plugins/mac/PluginViewMac.mm
    2792                 INCLUDEPATH += platform/mac
    2793                 # Note: XP_MACOSX is defined in npapi.h
    2794             } else {
    2795                 !embedded {
    2796                     CONFIG += x11
    2797                     LIBS += -lXrender
    2798                 }
    2799                 maemo5 {
    2800                     DEFINES += MOZ_PLATFORM_MAEMO=5
    2801                 }
    2802                 contains(DEFINES, Q_WS_MAEMO_6) {
    2803                     DEFINES += MOZ_PLATFORM_MAEMO=6
    2804                 }
    2805                 SOURCES += \
    2806                     plugins/qt/PluginContainerQt.cpp \
    2807                     plugins/qt/PluginPackageQt.cpp \
    2808                     plugins/qt/PluginViewQt.cpp
    2809                 HEADERS += \
    2810                     plugins/qt/PluginContainerQt.h
    2811                 DEFINES += XP_UNIX
    2812                 DEFINES += ENABLE_NETSCAPE_PLUGIN_METADATA_CACHE=1
    2813             }
     2556    unix:!symbian {
     2557        mac {
     2558            SOURCES += \
     2559                plugins/mac/PluginPackageMac.cpp
     2560            OBJECTIVE_SOURCES += \
     2561                platform/text/mac/StringImplMac.mm \
     2562                platform/mac/WebCoreNSStringExtras.mm \
     2563                plugins/mac/PluginViewMac.mm
     2564        } else {
     2565            SOURCES += \
     2566                plugins/qt/PluginContainerQt.cpp \
     2567                plugins/qt/PluginPackageQt.cpp \
     2568                plugins/qt/PluginViewQt.cpp
     2569            HEADERS += \
     2570                plugins/qt/PluginContainerQt.h
    28142571        }
    2815    
    2816         win32-* {
    2817             INCLUDEPATH += $$PWD/plugins/win \
    2818                            $$PWD/platform/win \
    2819                            $$PWD/platform/graphics/win
    2820    
    2821             SOURCES += plugins/win/PluginDatabaseWin.cpp \
    2822                        plugins/win/PluginPackageWin.cpp \
    2823                        plugins/win/PluginMessageThrottlerWin.cpp \
    2824                        plugins/win/PluginViewWin.cpp \
    2825                        platform/win/BitmapInfo.cpp \
    2826                        platform/win/WebCoreInstanceHandle.cpp
    2827    
    2828             LIBS += \
    2829                 -ladvapi32 \
    2830                 -lgdi32 \
    2831                 -lshell32 \
    2832                 -lshlwapi \
    2833                 -luser32 \
    2834                 -lversion
    2835         }
     2572    }
     2573
     2574    win32-* {
     2575        INCLUDEPATH += $$PWD/plugins/win \
     2576                       $$PWD/platform/win \
     2577                       $$PWD/platform/graphics/win
     2578
     2579        SOURCES += plugins/win/PluginDatabaseWin.cpp \
     2580                   plugins/win/PluginPackageWin.cpp \
     2581                   plugins/win/PluginMessageThrottlerWin.cpp \
     2582                   plugins/win/PluginViewWin.cpp \
     2583                   platform/win/BitmapInfo.cpp \
     2584                   platform/win/WebCoreInstanceHandle.cpp
    28362585    }
    28372586
    … …  
    28432592
    28442593contains(DEFINES, ENABLE_SQLITE=1) {
    2845     !system-sqlite:exists( $${SQLITE3SRCDIR}/sqlite3.c ) {
    2846             # Build sqlite3 into WebCore from source
    2847             # somewhat copied from $$QT_SOURCE_TREE/src/plugins/sqldrivers/sqlite/sqlite.pro
    2848             INCLUDEPATH += $${SQLITE3SRCDIR}
    2849             SOURCES += $${SQLITE3SRCDIR}/sqlite3.c
    2850             DEFINES += SQLITE_CORE SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE
    2851             CONFIG(release, debug|release): DEFINES *= NDEBUG
    2852             contains(DEFINES, ENABLE_SINGLE_THREADED=1): DEFINES += SQLITE_THREADSAFE=0
    2853     } else {
    2854         # Use sqlite3 from the underlying OS
    2855         CONFIG(QTDIR_build) {
    2856             QMAKE_CXXFLAGS *= $$QT_CFLAGS_SQLITE
    2857             LIBS *= $$QT_LFLAGS_SQLITE
    2858         } else {
    2859             INCLUDEPATH += $${SQLITE3SRCDIR}
    2860             LIBS += -lsqlite3
    2861         }
    2862     }
    2863 
    28642594    wince*:DEFINES += HAVE_LOCALTIME_S=0
    28652595
    … …  
    31742904            platform/graphics/gstreamer/ImageGStreamerQt.cpp
    31752905
    3176         DEFINES += WTF_USE_GSTREAMER=1
    3177         DEFINES += ENABLE_GLIB_SUPPORT=1
    3178 
    3179         INCLUDEPATH += $$PWD/platform/graphics/gstreamer
    3180 
    3181         PKGCONFIG += glib-2.0 gio-2.0 gstreamer-0.10 gstreamer-app-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gstreamer-plugins-base-0.10 gstreamer-video-0.10
    3182      } else:contains(MOBILITY_CONFIG, multimedia) {
     2906    } else:contains(MOBILITY_CONFIG, multimedia) {
    31832907        HEADERS += \
    3184             platform/graphics/qt/MediaPlayerPrivateQt.h \
    3185             $$PWD/../WebKit/qt/WebCoreSupport/FullScreenVideoQt.h \
    3186             $$PWD/../WebKit/qt/WebCoreSupport/FullScreenVideoWidget.h
     2908            platform/graphics/qt/MediaPlayerPrivateQt.h
    31872909
    31882910        SOURCES += \
    3189             platform/graphics/qt/MediaPlayerPrivateQt.cpp \
    3190             $$PWD/../WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp \
    3191             $$PWD/../WebKit/qt/WebCoreSupport/FullScreenVideoWidget.cpp
    3192 
    3193         CONFIG *= mobility
    3194         MOBILITY += multimedia
    3195         DEFINES += WTF_USE_QT_MULTIMEDIA
    3196      } else:contains(QT_CONFIG, phonon) {
     2911            platform/graphics/qt/MediaPlayerPrivateQt.cpp
     2912    } else:contains(QT_CONFIG, phonon) {
    31972913        HEADERS += \
    31982914            platform/graphics/qt/MediaPlayerPrivatePhonon.h
    … …  
    32002916        SOURCES += \
    32012917            platform/graphics/qt/MediaPlayerPrivatePhonon.cpp
    3202 
    3203         # Add phonon manually to prevent it from coming first in
    3204         # the include paths, as Phonon's path.h conflicts with
    3205         # WebCore's Path.h on case-insensitive filesystems.
    3206         qtAddLibrary(phonon)
    3207         INCLUDEPATH -= $$QT.phonon.includes
    3208         INCLUDEPATH += $$QT.phonon.includes
    3209         mac {
    3210             INCLUDEPATH -= $$QT.phonon.libs/phonon.framework/Headers
    3211             INCLUDEPATH += $$QT.phonon.libs/phonon.framework/Headers
    3212         }
    32132918    }
    32142919}
    … …  
    32342939}
    32352940
    3236 unix:!mac:!symbian:CONFIG += link_pkgconfig
    3237 
    32382941contains(DEFINES, ENABLE_XSLT=1) {
    3239     tobe|!tobe: QT += xmlpatterns
    3240 
    32412942    v8 {
    32422943        SOURCES += \
    … …  
    33493050    SOURCES += \
    33503051        platform/network/qt/NetworkStateNotifierQt.cpp
    3351 
    3352     # Bearer management is part of Qt 4.7, so don't accidentially
    3353     # pull in Qt Mobility when building against >= 4.7
    3354     !greaterThan(QT_MINOR_VERSION, 6) {
    3355         CONFIG += mobility
    3356         MOBILITY += bearer
    3357     }
    33583052}
    33593053
    33603054contains(DEFINES, ENABLE_GEOLOCATION=1) {
    3361      HEADERS += \
    3362         $$PWD/../WebKit/qt/WebCoreSupport/GeolocationClientQt.h
    3363      SOURCES += \
    3364         $$PWD/../WebKit/qt/WebCoreSupport/GeolocationClientQt.cpp
    3365  
    3366     CONFIG += mobility
    3367     MOBILITY += location
    3368 
    33693055    v8 {
    33703056        SOURCES += \
    … …  
    33733059            bindings/v8/custom/V8GeolocationCustom.cpp
    33743060    }
    3375 }
    3376 
    3377 contains(DEFINES, ENABLE_DEVICE_ORIENTATION=1) {
    3378     HEADERS += \
    3379         ../WebKit/qt/WebCoreSupport/DeviceMotionClientQt.h \
    3380         ../WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.h \
    3381         ../WebKit/qt/WebCoreSupport/DeviceOrientationClientQt.h \
    3382         ../WebKit/qt/WebCoreSupport/DeviceOrientationClientMockQt.h \
    3383         ../WebKit/qt/WebCoreSupport/DeviceOrientationProviderQt.h
    3384 
    3385     SOURCES += \
    3386         ../WebKit/qt/WebCoreSupport/DeviceMotionClientQt.cpp \
    3387         ../WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.cpp \
    3388         ../WebKit/qt/WebCoreSupport/DeviceOrientationClientQt.cpp \
    3389         ../WebKit/qt/WebCoreSupport/DeviceOrientationClientMockQt.cpp \
    3390         ../WebKit/qt/WebCoreSupport/DeviceOrientationProviderQt.cpp
    3391 
    3392     CONFIG += mobility
    3393     MOBILITY += sensors
    33943061}
    33953062
    … …  
    36753342
    36763343contains(DEFINES, ENABLE_WEBGL=1) {
    3677     tobe|!tobe: QT += opengl
    3678 
    36793344    HEADERS += \
    36803345        html/canvas/CanvasContextAttributes.h \
    … …  
    37363401}
    37373402
    3738 contains(DEFINES, ENABLE_SYMBIAN_DIALOG_PROVIDERS) {
    3739     # this feature requires the S60 platform private BrowserDialogsProvider.h header file
    3740     # and is therefore not enabled by default but only meant for platform builds.
    3741     symbian {
    3742         LIBS += -lbrowserdialogsprovider
    3743     }
    3744 }
    3745 
    3746 !symbian-abld:!symbian-sbsv2 {
    3747     modfile.files = $$moduleFile
    3748     modfile.path = $$[QMAKE_MKSPECS]/modules
    3749 
    3750     INSTALLS += modfile
    3751 } else {
    3752     # INSTALLS is not implemented in qmake's mmp generators, copy headers manually
    3753 
    3754     inst_modfile.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
    3755     inst_modfile.input = moduleFile
    3756     inst_modfile.output = $$[QMAKE_MKSPECS]/modules
    3757     inst_modfile.CONFIG = no_clean
    3758 
    3759     QMAKE_EXTRA_COMPILERS += inst_modfile
    3760 
    3761     install.depends += compiler_inst_modfile_make_all
    3762     QMAKE_EXTRA_TARGETS += install
    3763 }
    3764 
    3765 include($$PWD/../WebKit/qt/Api/headers.pri)
    3766 
    3767 HEADERS += $$WEBKIT_API_HEADERS
    3768 
    3769 !CONFIG(QTDIR_build) {
    3770     exists($$OUTPUT_DIR/include/QtWebKit/classheaders.pri): include($$OUTPUT_DIR/include/QtWebKit/classheaders.pri)
    3771     WEBKIT_INSTALL_HEADERS = $$WEBKIT_API_HEADERS $$WEBKIT_CLASS_HEADERS
    3772 
    3773     !symbian-abld:!symbian-sbsv2 {
    3774         headers.files = $$WEBKIT_INSTALL_HEADERS
    3775 
    3776         !isEmpty(INSTALL_HEADERS): headers.path = $$INSTALL_HEADERS/QtWebKit
    3777         else: headers.path = $$[QT_INSTALL_HEADERS]/QtWebKit
    3778 
    3779         !isEmpty(INSTALL_LIBS): target.path = $$INSTALL_LIBS
    3780         else: target.path = $$[QT_INSTALL_LIBS]
    3781 
    3782         INSTALLS += target headers
    3783     } else {
    3784         # INSTALLS is not implemented in qmake's mmp generators, copy headers manually
    3785         inst_headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
    3786         inst_headers.input = WEBKIT_INSTALL_HEADERS
    3787         inst_headers.CONFIG = no_clean
    3788 
    3789         !isEmpty(INSTALL_HEADERS): inst_headers.output = $$INSTALL_HEADERS/QtWebKit/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
    3790         else: inst_headers.output = $$[QT_INSTALL_HEADERS]/QtWebKit/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
    3791 
    3792         QMAKE_EXTRA_COMPILERS += inst_headers
    3793 
    3794         install.depends += compiler_inst_headers_make_all
    3795     }
    3796 
    3797     win32-*|wince* {
    3798         DLLDESTDIR = $$OUTPUT_DIR/bin
    3799         build_pass: TARGET = $$qtLibraryTarget($$TARGET)
    3800 
    3801         dlltarget.commands = $(COPY_FILE) $(DESTDIR_TARGET) $$[QT_INSTALL_BINS]
    3802         dlltarget.CONFIG = no_path
    3803         INSTALLS += dlltarget
    3804     }
    3805 
    3806     unix {
    3807         CONFIG += create_pc create_prl
    3808         QMAKE_PKGCONFIG_LIBDIR = $$target.path
    3809         QMAKE_PKGCONFIG_INCDIR = $$headers.path
    3810         QMAKE_PKGCONFIG_DESTDIR = pkgconfig
    3811         lib_replace.match = $$re_escape($$DESTDIR)
    3812         lib_replace.replace = $$[QT_INSTALL_LIBS]
    3813         QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace
    3814     }
    3815 
    3816     mac {
    3817         !static:contains(QT_CONFIG, qt_framework):!CONFIG(webkit_no_framework) {
    3818             !build_pass {
    3819                 message("Building QtWebKit as a framework, as that's how Qt was built. You can")
    3820                 message("override this by passing CONFIG+=webkit_no_framework to build-webkit.")
    3821 
    3822                 CONFIG += build_all
    3823             } else {
    3824                 debug_and_release:TARGET = $$qtLibraryTarget($$TARGET)
    3825             }
    3826 
    3827             CONFIG += lib_bundle qt_no_framework_direct_includes qt_framework
    3828             FRAMEWORK_HEADERS.version = Versions
    3829             FRAMEWORK_HEADERS.files = $${headers.files}
    3830             FRAMEWORK_HEADERS.path = Headers
    3831             QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
    3832         }
    3833 
    3834         QMAKE_LFLAGS_SONAME = "$${QMAKE_LFLAGS_SONAME}$${DESTDIR}$${QMAKE_DIR_SEP}"
    3835         LIBS += -framework Carbon -framework AppKit
    3836     }
    3837 }
    3838 
    3839 !CONFIG(webkit-debug):CONFIG(QTDIR_build) {
    3840     # Remove the following 2 lines if you want debug information in WebCore
    3841     CONFIG -= separate_debug_info
    3842     CONFIG += no_debug_info
    3843 }
    3844 
    3845 win32:!win32-g++*:contains(QMAKE_HOST.arch, x86_64):{
    3846     asm_compiler.commands = ml64 /c
    3847     asm_compiler.commands +=  /Fo ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
    3848     asm_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
    3849     asm_compiler.input = ASM_SOURCES
    3850     asm_compiler.variable_out = OBJECTS
    3851     asm_compiler.name = compiling[asm] ${QMAKE_FILE_IN}
    3852     silent:asm_compiler.commands = @echo compiling[asm] ${QMAKE_FILE_IN} && $$asm_compiler.commands
    3853     QMAKE_EXTRA_COMPILERS += asm_compiler
    3854 
    3855     ASM_SOURCES += \
    3856         plugins/win/PaintHooks.asm
    3857    if(win32-msvc2005|win32-msvc2008):equals(TEMPLATE_PREFIX, "vc") {
    3858         SOURCES += \
    3859             plugins/win/PaintHooks.asm
    3860     }
    3861 }
    3862 
    3863 # Uncomment this to enable Texture Mapper.
    3864 # CONFIG += texmap
    3865 
    38663403contains(CONFIG, texmap) {
    38673404    DEFINES += WTF_USE_TEXTURE_MAPPER=1
    … …  
    38793416
    38803417    contains(QT_CONFIG, opengl) {
    3881         QT += opengl
    38823418        HEADERS += platform/graphics/opengl/TextureMapperGL.h
    38833419        SOURCES += platform/graphics/opengl/TextureMapperGL.cpp
    … …  
    38873423    SOURCES += platform/graphics/qt/GraphicsLayerQt.cpp
    38883424}
    3889 
    3890 symbian {
    3891     shared {
    3892         contains(CONFIG, def_files) {
    3893             DEF_FILE=../WebKit/qt/symbian
    3894             # defFilePath is for Qt4.6 compatibility
    3895             defFilePath=../WebKit/qt/symbian
    3896         } else {
    3897             MMP_RULES += EXPORTUNFROZEN
    3898         }
    3899     }
    3900 }
    3901 
    3902 # Disable C++0x mode in WebCore for those who enabled it in their Qt's mkspec
    3903 *-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x

  • trunk/Source/WebKit.pri

    r79072 r79320  
    5252}
    5353
    54 INCLUDEPATH += $$OUTPUT_DIR/include/QtWebKit
     54INCLUDEPATH += \
     55    $$OUTPUT_DIR/include/QtWebKit \
     56    $$OUTPUT_DIR/include
    5557INCLUDEPATH += $$QT.script.includes
    5658

  • trunk/Source/WebKit.pro

    r76496 r79320  
    1212
    1313SUBDIRS += WebCore
     14SUBDIRS += WebKit/qt/QtWebKit.pro
    1415
    1516webkit2:exists($$PWD/WebKit2/WebProcess.pro): SUBDIRS += WebKit2/WebProcess.pro

  • trunk/Source/WebKit/qt/ChangeLog

    r79196 r79320  
     12011-02-22  Andras Becsi  <abecsi@webkit.org>
     2
     3        Reviewed by Laszlo Gombos.
     4
     5        [Qt] Redesign the build system
     6        https://bugs.webkit.org/show_bug.cgi?id=51339
     7
     8        Part 2.
     9
     10        Build WebCore as a static library, compile the WebKit API and WebKit2 API
     11        in a final step and link to WebKit2, WebCore and JSC libraries to fix
     12        linking issues resulting from stripped away symbols.
     13
     14        * QtWebKit.pro: Added.
     15        Project file for the final build step.
     16
    1172011-02-17  Ryosuke Niwa  <rniwa@webkit.org>
    218

  • trunk/Source/WebKit2/ChangeLog

    r79316 r79320  
     12011-02-22  Andras Becsi  <abecsi@webkit.org>
     2
     3        Reviewed by Laszlo Gombos.
     4
     5        [Qt] Redesign the build system
     6        https://bugs.webkit.org/show_bug.cgi?id=51339
     7
     8        Part 2.
     9
     10        Build WebCore as a static library, compile the WebKit API and WebKit2 API
     11        in a final step and link to WebKit2, WebCore and JSC libraries to fix
     12        linking issues resulting from stripped away symbols.
     13
     14        * WebKit2.pri: Add include paths.
     15        * WebKit2.pro: Move include paths to WebKit2.pri and move
     16        the API source to WebKit/qt/QtWebKit.pro
     17
    1182011-02-22  Benjamin Poulain  <benjamin.poulain@nokia.com>
    219

  • trunk/Source/WebKit2/WebKit2.pri

    r71243 r79320  
    11# WebKit2 - Qt4 build info
    22
    3 QT += network
     3SOURCE_DIR = $$replace(PWD, /WebKit2, "")
    44
    55# Use a config-specific target to prevent parallel builds file clashes on Mac
    … …  
    1010CONFIG(debug, debug|release) : WEBKIT2_DESTDIR = debug
    1111else: WEBKIT2_DESTDIR = release
     12
     13CONFIG(standalone_package) {
     14    isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
     15} else {
     16    isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = generated
     17}
     18
     19WEBKIT2_INCLUDEPATH = \
     20    $$SOURCE_DIR/WebKit2 \
     21    $$SOURCE_DIR/WebKit2/Platform \
     22    $$SOURCE_DIR/WebKit2/Platform/CoreIPC \
     23    $$SOURCE_DIR/WebKit2/Platform/qt \
     24    $$SOURCE_DIR/WebKit2/Shared \
     25    $$SOURCE_DIR/WebKit2/Shared/API/c \
     26    $$SOURCE_DIR/WebKit2/Shared/CoreIPCSupport \
     27    $$SOURCE_DIR/WebKit2/Shared/Plugins \
     28    $$SOURCE_DIR/WebKit2/Shared/Plugins/Netscape \
     29    $$SOURCE_DIR/WebKit2/Shared/qt \
     30    $$SOURCE_DIR/WebKit2/UIProcess \
     31    $$SOURCE_DIR/WebKit2/UIProcess/API/C \
     32    $$SOURCE_DIR/WebKit2/UIProcess/API/cpp \
     33    $$SOURCE_DIR/WebKit2/UIProcess/API/cpp/qt \
     34    $$SOURCE_DIR/WebKit2/UIProcess/API/qt \
     35    $$SOURCE_DIR/WebKit2/UIProcess/Authentication \
     36    $$SOURCE_DIR/WebKit2/UIProcess/Downloads \
     37    $$SOURCE_DIR/WebKit2/UIProcess/Launcher \
     38    $$SOURCE_DIR/WebKit2/UIProcess/Plugins \
     39    $$SOURCE_DIR/WebKit2/UIProcess/qt \
     40    $$SOURCE_DIR/WebKit2/WebProcess \
     41    $$SOURCE_DIR/WebKit2/WebProcess/Authentication \
     42    $$SOURCE_DIR/WebKit2/WebProcess/Downloads \
     43    $$SOURCE_DIR/WebKit2/WebProcess/Downloads/qt \
     44    $$SOURCE_DIR/WebKit2/WebProcess/Geolocation \
     45    $$SOURCE_DIR/WebKit2/WebProcess/InjectedBundle \
     46    $$SOURCE_DIR/WebKit2/WebProcess/InjectedBundle/DOM \
     47    $$SOURCE_DIR/WebKit2/WebProcess/InjectedBundle/API/c \
     48    $$SOURCE_DIR/WebKit2/WebProcess/Plugins \
     49    $$SOURCE_DIR/WebKit2/WebProcess/Plugins/Netscape \
     50    $$SOURCE_DIR/WebKit2/WebProcess/ResourceCache \
     51    $$SOURCE_DIR/WebKit2/WebProcess/WebCoreSupport \
     52    $$SOURCE_DIR/WebKit2/WebProcess/WebCoreSupport/qt \
     53    $$SOURCE_DIR/WebKit2/WebProcess/WebPage \
     54    $$SOURCE_DIR/WebKit2/WebProcess/qt
     55
     56# On Symbian PREPEND_INCLUDEPATH is the best way to make sure that WebKit headers
     57# are included before platform headers.
     58
     59symbian {
     60    PREPEND_INCLUDEPATH = $$WEBKIT2_INCLUDEPATH $$WEBKIT2_GENERATED_SOURCES_DIR $$PREPEND_INCLUDEPATH
     61} else {
     62    INCLUDEPATH = $$WEBKIT2_INCLUDEPATH $$WEBKIT2_GENERATED_SOURCES_DIR $$INCLUDEPATH
     63}
    1264
    1365defineTest(_addWebKit2Lib_common) {

  • trunk/Source/WebKit2/WebKit2.pro

    r79297 r79320  
    55
    66isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
    7 
    8 CONFIG(standalone_package) {
    9     isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
    10     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated
    11 } else {
    12     isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = generated
    13     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../WebCore/generated
    14 }
    157
    168include($$PWD/../WebKit.pri)
    … …  
    3325# Build both debug and release configurations
    3426mac: CONFIG += build_all
    35 
    36 WEBKIT2_INCLUDEPATH = \
    37     $$PWD \
    38     Platform \
    39     Platform/CoreIPC \
    40     Platform/qt \
    41     Shared \
    42     Shared/API/c \
    43     Shared/CoreIPCSupport \
    44     Shared/Plugins \
    45     Shared/Plugins/Netscape \
    46     Shared/qt \
    47     UIProcess \
    48     UIProcess/API/C \
    49     UIProcess/API/cpp \
    50     UIProcess/API/cpp/qt \
    51     UIProcess/API/qt \
    52     UIProcess/Authentication \
    53     UIProcess/Downloads \
    54     UIProcess/Launcher \
    55     UIProcess/Plugins \
    56     UIProcess/qt \
    57     WebProcess \
    58     WebProcess/Authentication \
    59     WebProcess/Downloads \
    60     WebProcess/Downloads/qt \
    61     WebProcess/Geolocation \
    62     WebProcess/InjectedBundle \
    63     WebProcess/InjectedBundle/DOM \
    64     WebProcess/InjectedBundle/API/c \
    65     WebProcess/ResourceCache \
    66     WebProcess/Plugins \
    67     WebProcess/Plugins/Netscape \
    68     WebProcess/WebCoreSupport \
    69     WebProcess/WebCoreSupport/qt \
    70     WebProcess/WebPage \
    71     WebProcess/qt \
    72     $$OUTPUT_DIR/include
    73 
    74 WEBKIT2_INCLUDEPATH = \
    75     $$WC_GENERATED_SOURCES_DIR \
    76     $$WEBKIT2_GENERATED_SOURCES_DIR \
    77     $$WEBKIT2_INCLUDEPATH
    78 
    79 # On Symbian PREPEND_INCLUDEPATH is the best way to make sure that WebKit headers
    80 # are included before platform headers.
    81 
    82 symbian {
    83     PREPEND_INCLUDEPATH = $$WEBKIT2_INCLUDEPATH $$PREPEND_INCLUDEPATH
    84 } else {
    85     INCLUDEPATH = $$WEBKIT2_INCLUDEPATH $$INCLUDEPATH
    86 }
    8727
    8828WEBKIT2_GENERATED_HEADERS = \
    … …  
    14989    Platform/WorkItem.h \
    15090    Platform/WorkQueue.h \
    151     Shared/API/c/WKBase.h \
    152     Shared/API/c/WKCertificateInfo.h \
    153     Shared/API/c/WKContextMenuItem.h \
    154     Shared/API/c/WKContextMenuItemTypes.h \
    155     Shared/API/c/WKGeometry.h \
    156     Shared/API/c/WKGraphicsContext.h \
    157     Shared/API/c/WKImage.h \
    158     Shared/API/c/WKNumber.h \
    159     Shared/API/c/WKPageLoadTypes.h \
    160     Shared/API/c/WKSecurityOrigin.h \
    161     Shared/API/c/WKSerializedScriptValue.h \
    162     Shared/API/c/WKSharedAPICast.h \
    163     Shared/API/c/WKString.h \
    164     Shared/API/c/WKStringPrivate.h \
    165     Shared/API/c/WKType.h \
    166     Shared/API/c/WKURL.h \
    167     Shared/API/c/WKURLRequest.h \
    168     Shared/API/c/WKURLResponse.h \
    169     Shared/API/c/WKUserContentURLPattern.h \
    17091    Shared/ShareableBitmap.h \
    17192    Shared/CacheModel.h \
    … …  
    217138    Shared/qt/UpdateChunk.h \
    218139    Shared/qt/WebEventFactoryQt.h \
    219     UIProcess/API/C/WKAPICast.h \
    220     UIProcess/API/C/WKAuthenticationChallenge.h \
    221     UIProcess/API/C/WKAuthenticationDecisionListener.h \
    222     UIProcess/API/C/WKBackForwardList.h \
    223     UIProcess/API/C/WKBackForwardListItem.h \
    224     UIProcess/API/C/WKResourceCacheManager.h \
    225     UIProcess/API/C/WKContext.h \
    226     UIProcess/API/C/WKContextPrivate.h \
    227     UIProcess/API/C/WKCredential.h \
    228     UIProcess/API/C/WKCredentialTypes.h \
    229     UIProcess/API/C/WKDatabaseManager.h \
    230     UIProcess/API/C/WKDownload.h \
    231     UIProcess/API/C/WKFrame.h \
    232     UIProcess/API/C/WKFramePolicyListener.h \
    233     UIProcess/API/C/WKGeolocationManager.h \
    234     UIProcess/API/C/WKGeolocationPermissionRequest.h \
    235     UIProcess/API/C/WKGeolocationPosition.h \
    236     UIProcess/API/C/WKInspector.h \
    237     UIProcess/API/C/WKOpenPanelParameters.h \
    238     UIProcess/API/C/WKOpenPanelResultListener.h \
    239     UIProcess/API/C/WKNavigationData.h \
    240     UIProcess/API/C/WKPage.h \
    241     UIProcess/API/C/WKPageGroup.h \
    242     UIProcess/API/C/WKPagePrivate.h \
    243     UIProcess/API/C/WKPluginSiteDataManager.h \
    244     UIProcess/API/C/WKPreferences.h \
    245     UIProcess/API/C/WKPreferencesPrivate.h \
    246     UIProcess/API/C/WKProtectionSpace.h \
    247     UIProcess/API/C/WKProtectionSpaceTypes.h \
    248     UIProcess/API/C/WebKit2.h \
    249     UIProcess/API/C/qt/WKNativeEvent.h \
    250     UIProcess/API/cpp/WKRetainPtr.h \
    251     UIProcess/API/cpp/qt/WKStringQt.h \
    252     UIProcess/API/cpp/qt/WKURLQt.h \
    253     UIProcess/API/qt/ClientImpl.h \
    254     UIProcess/API/qt/qgraphicswkview.h \
    255     UIProcess/API/qt/qwkcontext.h \
    256     UIProcess/API/qt/qwkcontext_p.h \
    257     UIProcess/API/qt/qwkhistory.h \
    258     UIProcess/API/qt/qwkhistory_p.h \
    259     UIProcess/API/qt/qwkpage.h \
    260     UIProcess/API/qt/qwkpage_p.h \
    261     UIProcess/API/qt/qwkpreferences.h \
    262140    UIProcess/Authentication/AuthenticationChallengeProxy.h \
    263141    UIProcess/Authentication/AuthenticationDecisionListener.h \
    … …  
    318196    WebProcess/Geolocation/GeolocationPermissionRequestManager.h \
    319197    WebProcess/Geolocation/WebGeolocationManager.h \
    320     WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.h \
    321     WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.h \
    322     WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h \
    323     WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.h \
    324     WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.h \
    325     WebProcess/InjectedBundle/API/c/WKBundleNodeHandlePrivate.h \
    326     WebProcess/InjectedBundle/API/c/WKBundlePage.h \
    327     WebProcess/InjectedBundle/API/c/WKBundlePageGroup.h \
    328     WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h \
    329198    WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h \
    330199    WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h \
    … …  
    396265    Platform/qt/SharedMemoryQt.cpp \
    397266    Platform/qt/WorkQueueQt.cpp \
    398     Shared/API/c/WKArray.cpp \
    399     Shared/API/c/WKCertificateInfo.cpp \
    400     Shared/API/c/WKContextMenuItem.cpp \
    401     Shared/API/c/WKGraphicsContext.cpp \
    402     Shared/API/c/WKImage.cpp \
    403     Shared/API/c/WKNumber.cpp \
    404     Shared/API/c/WKSecurityOrigin.cpp \
    405     Shared/API/c/WKSerializedScriptValue.cpp \
    406     Shared/API/c/WKString.cpp \
    407     Shared/API/c/WKType.cpp \
    408     Shared/API/c/WKURL.cpp \
    409     Shared/API/c/WKURLRequest.cpp \
    410     Shared/API/c/WKURLResponse.cpp \
    411     Shared/API/c/WKUserContentURLPattern.cpp \
    412267    Shared/Plugins/Netscape/NetscapePluginModule.cpp \
    413268    Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp \
    … …  
    454309    Shared/qt/WebURLRequestQt.cpp \
    455310    Shared/qt/WebURLResponseQt.cpp \
    456     UIProcess/API/C/WKAuthenticationChallenge.cpp \
    457     UIProcess/API/C/WKAuthenticationDecisionListener.cpp \
    458     UIProcess/API/C/WKBackForwardList.cpp \
    459     UIProcess/API/C/WKBackForwardListItem.cpp \
    460     UIProcess/API/C/WKResourceCacheManager.cpp \
    461     UIProcess/API/C/WKContext.cpp \
    462     UIProcess/API/C/WKCredential.cpp \
    463     UIProcess/API/C/WKDatabaseManager.cpp \
    464     UIProcess/API/C/WKDownload.cpp \
    465     UIProcess/API/C/WKFrame.cpp \
    466     UIProcess/API/C/WKFramePolicyListener.cpp \
    467     UIProcess/API/C/WKGeolocationManager.cpp \
    468     UIProcess/API/C/WKGeolocationPermissionRequest.cpp \
    469     UIProcess/API/C/WKGeolocationPosition.cpp \
    470     UIProcess/API/C/WKInspector.cpp \
    471     UIProcess/API/C/WKOpenPanelParameters.cpp \
    472     UIProcess/API/C/WKOpenPanelResultListener.cpp \
    473     UIProcess/API/C/WKNavigationData.cpp \
    474     UIProcess/API/C/WKPage.cpp \
    475     UIProcess/API/C/WKPageGroup.cpp \
    476     UIProcess/API/C/WKPluginSiteDataManager.cpp \
    477     UIProcess/API/C/WKPreferences.cpp \
    478     UIProcess/API/C/WKProtectionSpace.cpp \
    479     UIProcess/API/cpp/qt/WKStringQt.cpp \
    480     UIProcess/API/cpp/qt/WKURLQt.cpp \
    481     UIProcess/API/qt/ClientImpl.cpp \
    482     UIProcess/API/qt/qgraphicswkview.cpp \
    483     UIProcess/API/qt/qwkcontext.cpp \
    484     UIProcess/API/qt/qwkhistory.cpp \
    485     UIProcess/API/qt/qwkpage.cpp \
    486     UIProcess/API/qt/qwkpreferences.cpp \
    487311    UIProcess/Authentication/AuthenticationChallengeProxy.cpp \
    488312    UIProcess/Authentication/AuthenticationDecisionListener.cpp \
    … …  
    552376    WebProcess/Geolocation/WebGeolocationManager.cpp \
    553377    WebProcess/Downloads/qt/DownloadQt.cpp \
    554     WebProcess/InjectedBundle/API/c/WKBundle.cpp \
    555     WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.cpp \
    556     WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.cpp \
    557     WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp \
    558     WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp \
    559     WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp \
    560     WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.cpp \
    561     WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp \
    562     WebProcess/InjectedBundle/API/c/WKBundlePage.cpp \
    563     WebProcess/InjectedBundle/API/c/WKBundlePageGroup.cpp \
    564     WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp \
    565     WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp \
    566378    WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp \
    567379    WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp \

  • trunk/Tools/ChangeLog

    r79295 r79320  
     12011-02-22  Andras Becsi  <abecsi@webkit.org>
     2
     3        Reviewed by Laszlo Gombos.
     4
     5        [Qt] Redesign the build system
     6        https://bugs.webkit.org/show_bug.cgi?id=51339
     7
     8        Part 2.
     9
     10        Build WebCore as a static library, compile the WebKit API and WebKit2 API
     11        in a final step and link to WebKit2, WebCore and JSC libraries to fix
     12        linking issues resulting from stripped away symbols.
     13
     14        * WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro: Remove superfluous includepaths.
     15
    1162011-02-21  Lukasz Slachciak  <l.slachciak@samsung.com>
    217

  • trunk/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro

    r77798 r79320  
    5050addWebKit2Lib(../../../WebKit2)
    5151
    52 INCLUDEPATH += \
     52INCLUDEPATH = \
    5353    $$PWD \
    5454    $$PWD/.. \
    5555    $$PWD/../.. \
    5656    $$PWD/../Bindings \
     57    $$PWD/../../../../Source \
    5758    $$PWD/../../../../Source/JavaScriptCore \
    58     $$PWD/../../../../Source/JavaScriptCore/wtf \
     59    $$PWD/../../../../Source/JavaScriptCore/ForwardingHeaders \
     60    $$PWD/../../../../Source/JavaScriptCore/wtf/unicode \
    5961    $$PWD/../../../../Source/WebCore \
    6062    $$PWD/../../../../Source/WebCore/platform/text \
    6163    $$PWD/../../../../Source/WebKit2 \
    6264    $$PWD/../../../../Source/WebKit2/Shared \
    63     $$GENERATED_SOURCES_DIR
     65    $$OUTPUT_DIR/include/QtWebKit \
     66    $$OUTPUT_DIR/include \
     67    $$GENERATED_SOURCES_DIR \
     68    $$WC_GENERATED_SOURCES_DIR
    6469
    65 INCLUDEPATH += \
    66     $$OUTPUT_DIR/include \
    67     $$WC_GENERATED_SOURCES_DIR
    6870
    6971PREFIX_HEADER = $$PWD/../../WebKitTestRunnerPrefix.h
Note: See TracChangeset for help on using the changeset viewer.