Commit a498b0ec authored by vestbo@webkit.org's avatar vestbo@webkit.org
Browse files

[Qt] Remove old cruft from the qmake build system

Rubber-stamped by Simon Hausmann.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@128618 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 1bd86b3b
2012-09-14 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
[Qt] Remove old cruft from the qmake build system
Rubber-stamped by Simon Hausmann.
* DerivedSources.pri:
* Target.pri:
2012-09-14 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
 
[Qt] Make force_static_libs_as_shared work on Mac OS
......@@ -63,10 +63,6 @@ INJECTED_SCRIPT_SOURCE = $$PWD/inspector/InjectedScriptSource.js
INJECTED_SCRIPT_WEBGL_MODULE_SOURCE = $$PWD/inspector/InjectedScriptWebGLModuleSource.js
DEBUGGER_SCRIPT_SOURCE = $$PWD/bindings/v8/DebuggerScript.js
ARRAY_BUFFER_VIEW_CUSTOM_SCRIPT_SOURCE = $$PWD/bindings/v8/custom/V8ArrayBufferViewCustomScript.js
XPATHBISON = $$PWD/xml/XPathGrammar.y
enable?(SVG) {
......@@ -805,19 +801,6 @@ InjectedScriptWebGLModuleSource.commands = perl $$PWD/inspector/xxd.pl InjectedS
InjectedScriptWebGLModuleSource.add_output_to_sources = false
GENERATORS += InjectedScriptWebGLModuleSource
# GENERATOR 2-c: inspector debugger script source compiler
debuggerScriptSource.output = DebuggerScriptSource.h
debuggerScriptSource.input = DEBUGGER_SCRIPT_SOURCE
debuggerScriptSource.commands = perl $$PWD/inspector/xxd.pl DebuggerScriptSource_js ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
debuggerScriptSource.add_output_to_sources = false
GENERATORS += debuggerScriptSource
arrayBufferViewCustomScript.output = V8ArrayBufferViewCustomScript.h
arrayBufferViewCustomScript.input = ARRAY_BUFFER_VIEW_CUSTOM_SCRIPT_SOURCE
arrayBufferViewCustomScript.commands = perl $$PWD/inspector/xxd.pl V8ArrayBufferViewCustomScript_js ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
arrayBufferViewCustomScript.add_output_to_sources = false
GENERATORS += arrayBufferViewCustomScript
# GENERATOR 4: CSS grammar
cssbison.output = ${QMAKE_FILE_BASE}.cpp
cssbison.input = CSSBISON
......
......@@ -14,8 +14,6 @@ WEBKIT += javascriptcore
CONFIG += staticlib
DEFINES += QT_MAKEDLL
RESOURCES += \
$$PWD/WebCore.qrc
......
2012-09-14 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
[Qt] Remove old cruft from the qmake build system
Rubber-stamped by Simon Hausmann.
* DumpRenderTree/qt/DumpRenderTree.pro:
* qmake/mkspecs/features/default_post.prf:
2012-09-14 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
 
[Qt] Enable force_static_libs_as_shared for development
......
......@@ -9,8 +9,7 @@ TEMPLATE = app
TARGET = DumpRenderTree
DESTDIR = $$ROOT_BUILD_DIR/bin
WEBKIT += wtf webcore
!v8: WEBKIT += javascriptcore
WEBKIT += wtf javascriptcore webcore
INCLUDEPATH += \
$$PWD/ \
......
......@@ -65,12 +65,6 @@ CONFIG -= warn_on
-Winit-self \
$$QMAKE_CXXFLAGS
v8: DEFINES += WTF_USE_V8=1
else {
contains(JAVASCRIPTCORE_JIT, yes): DEFINES+=ENABLE_JIT=1
contains(JAVASCRIPTCORE_JIT, no): DEFINES+=ENABLE_JIT=0
}
# Enable dynamic instead of static libraries for development
!production_build:!buildbot:!win*: CONFIG += force_static_libs_as_shared
......@@ -190,8 +184,7 @@ contains(QT, webkit) {
# In addition to the main shared QtWebKit library we also
# need to link to any intermediate shared libraries.
force_static_libs_as_shared {
WEBKIT += wtf webcore
!v8: WEBKIT += javascriptcore
WEBKIT += wtf javascriptcore webcore
build?(webkit1): WEBKIT += webkit1
build?(webkit2): WEBKIT += webkit2
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment