diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
| commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
| tree | f478babb801e720de7bfaee23443ffe029f58731 /Source/WebCore/WebCore.pri | |
| parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
| download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 | |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/WebCore/WebCore.pri')
| -rw-r--r-- | Source/WebCore/WebCore.pri | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri index 0c33eed..736d534 100644 --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri @@ -60,6 +60,7 @@ STYLESHEETS_EMBED = \ $$PWD/css/wml.css \ $$PWD/css/mediaControls.css \ $$PWD/css/mediaControlsQt.css \ + $$PWD/css/mediaControlsQtFullscreen.css \ $$PWD/css/themeQtNoListboxes.css \ $$PWD/css/themeQtMobile.css @@ -213,6 +214,7 @@ IDL_BINDINGS += \ html/DOMFormData.idl \ html/DOMSettableTokenList.idl \ html/DOMTokenList.idl \ + html/DOMURL.idl \ html/HTMLAllCollection.idl \ html/HTMLAudioElement.idl \ html/HTMLAnchorElement.idl \ @@ -537,6 +539,7 @@ IDL_BINDINGS += \ INSPECTOR_INTERFACES = inspector/Inspector.idl INSPECTOR_BACKEND_STUB_QRC = inspector/front-end/InspectorBackendStub.qrc +INJECTED_SCRIPT_SOURCE = $$PWD/inspector/InjectedScriptSource.js v8: wrapperFactoryArg = --wrapperFactoryV8 else: wrapperFactoryArg = --wrapperFactory @@ -650,6 +653,12 @@ inspectorBackendStub.tempNames = $$PWD/$$INSPECTOR_BACKEND_STUB_QRC $${WC_GENERA inspectorBackendStub.commands = $$QMAKE_COPY $$replace(inspectorBackendStub.tempNames, "/", $$QMAKE_DIR_SEP) addExtraCompiler(inspectorBackendStub) +# GENERATOR 2-a: inspector injected script source compiler +injectedScriptSource.output = $${WC_GENERATED_SOURCES_DIR}/InjectedScriptSource.h +injectedScriptSource.input = INJECTED_SCRIPT_SOURCE +injectedScriptSource.commands = perl $$PWD/inspector/xxd.pl InjectedScriptSource_js $$PWD/inspector/InjectedScriptSource.js $${WC_GENERATED_SOURCES_DIR}/InjectedScriptSource.h +addExtraCompiler(injectedScriptSource) + # GENERATOR 3: tokenizer (flex) tokenizer.output = $${WC_GENERATED_SOURCES_DIR}/${QMAKE_FILE_BASE}.cpp tokenizer.input = TOKENIZER @@ -737,11 +746,11 @@ xpathbison.depends = ${QMAKE_FILE_NAME} addExtraCompiler(xpathbison) # GENERATOR 11: WebKit Version -# The appropriate Apple-maintained Version.xcconfig file for WebKit version information is in WebKit/mac/Configurations/. -webkitversion.wkScript = $$PWD/../../WebKit/scripts/generate-webkitversion.pl +# The appropriate Apple-maintained Version.xcconfig file for WebKit version information is in Source/WebKit/mac/Configurations/. +webkitversion.wkScript = $$PWD/../../Source/WebKit/scripts/generate-webkitversion.pl webkitversion.output = $${WC_GENERATED_SOURCES_DIR}/WebKitVersion.h webkitversion.input = webkitversion.wkScript -webkitversion.commands = perl $$webkitversion.wkScript --config $$PWD/../../WebKit/mac/Configurations/Version.xcconfig --outputDir $${WC_GENERATED_SOURCES_DIR}/ +webkitversion.commands = perl $$webkitversion.wkScript --config $$PWD/../../Source/WebKit/mac/Configurations/Version.xcconfig --outputDir $${WC_GENERATED_SOURCES_DIR}/ webkitversion.clean = ${QMAKE_VAR_WC_GENERATED_SOURCES_DIR}/WebKitVersion.h webkitversion.wkAddOutputToSources = false addExtraCompiler(webkitversion) |