Title: [128618] trunk
- Revision
- 128618
- Author
- ves...@webkit.org
- Date
- 2012-09-14 09:21:53 -0700 (Fri, 14 Sep 2012)
Log Message
[Qt] Remove old cruft from the qmake build system
Rubber-stamped by Simon Hausmann.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (128617 => 128618)
--- trunk/Source/WebCore/ChangeLog 2012-09-14 15:58:50 UTC (rev 128617)
+++ trunk/Source/WebCore/ChangeLog 2012-09-14 16:21:53 UTC (rev 128618)
@@ -1,5 +1,14 @@
2012-09-14 Tor Arne Vestbø <tor.arne.ves...@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.ves...@nokia.com>
+
[Qt] Make force_static_libs_as_shared work on Mac OS
We had to move a few LIBS += around that were in the wrong place,
Modified: trunk/Source/WebCore/DerivedSources.pri (128617 => 128618)
--- trunk/Source/WebCore/DerivedSources.pri 2012-09-14 15:58:50 UTC (rev 128617)
+++ trunk/Source/WebCore/DerivedSources.pri 2012-09-14 16:21:53 UTC (rev 128618)
@@ -63,10 +63,6 @@
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.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
Modified: trunk/Source/WebCore/Target.pri (128617 => 128618)
--- trunk/Source/WebCore/Target.pri 2012-09-14 15:58:50 UTC (rev 128617)
+++ trunk/Source/WebCore/Target.pri 2012-09-14 16:21:53 UTC (rev 128618)
@@ -14,8 +14,6 @@
CONFIG += staticlib
-DEFINES += QT_MAKEDLL
-
RESOURCES += \
$$PWD/WebCore.qrc
Modified: trunk/Tools/ChangeLog (128617 => 128618)
--- trunk/Tools/ChangeLog 2012-09-14 15:58:50 UTC (rev 128617)
+++ trunk/Tools/ChangeLog 2012-09-14 16:21:53 UTC (rev 128618)
@@ -1,5 +1,14 @@
2012-09-14 Tor Arne Vestbø <tor.arne.ves...@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.ves...@nokia.com>
+
[Qt] Enable force_static_libs_as_shared for development
Not enabled for buildbots or production-builds (part of Qt5)
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro (128617 => 128618)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2012-09-14 15:58:50 UTC (rev 128617)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2012-09-14 16:21:53 UTC (rev 128618)
@@ -9,8 +9,7 @@
TARGET = DumpRenderTree
DESTDIR = $$ROOT_BUILD_DIR/bin
-WEBKIT += wtf webcore
-!v8: WEBKIT += _javascript_core
+WEBKIT += wtf _javascript_core webcore
INCLUDEPATH += \
$$PWD/ \
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (128617 => 128618)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-09-14 15:58:50 UTC (rev 128617)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-09-14 16:21:53 UTC (rev 128618)
@@ -65,12 +65,6 @@
-Winit-self \
$$QMAKE_CXXFLAGS
-v8: DEFINES += WTF_USE_V8=1
-else {
- contains(_javascript_CORE_JIT, yes): DEFINES+=ENABLE_JIT=1
- contains(_javascript_CORE_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 @@
# 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 += _javascript_core
+ WEBKIT += wtf _javascript_core webcore
build?(webkit1): WEBKIT += webkit1
build?(webkit2): WEBKIT += webkit2
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
