Title: [136299] trunk/Source
- Revision
- 136299
- Author
- [email protected]
- Date
- 2012-11-30 17:19:09 -0800 (Fri, 30 Nov 2012)
Log Message
[Qt] Unreviewed speculative Mac build fix after r136232
Source/_javascript_Core:
Update the include path so that LLIntAssembly.h is picked up.
The bot didn't break until later when a clean build was triggered.
* _javascript_Core.pri:
Source/WebKit2:
cleanup an oversight from r136235
* PluginProcess.pro: s/webkit/webkitwidgets/
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (136298 => 136299)
--- trunk/Source/_javascript_Core/ChangeLog 2012-12-01 00:53:01 UTC (rev 136298)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-12-01 01:19:09 UTC (rev 136299)
@@ -1,3 +1,12 @@
+2012-11-30 Pierre Rossi <[email protected]>
+
+ [Qt] Unreviewed speculative Mac build fix after r136232
+
+ Update the include path so that LLIntAssembly.h is picked up.
+ The bot didn't break until later when a clean build was triggered.
+
+ * _javascript_Core.pri:
+
2012-11-30 Oliver Hunt <[email protected]>
Optimise more cases of op_typeof
Modified: trunk/Source/_javascript_Core/_javascript_Core.pri (136298 => 136299)
--- trunk/Source/_javascript_Core/_javascript_Core.pri 2012-12-01 00:53:01 UTC (rev 136298)
+++ trunk/Source/_javascript_Core/_javascript_Core.pri 2012-12-01 01:19:09 UTC (rev 136299)
@@ -32,6 +32,9 @@
$$SOURCE_DIR/ForwardingHeaders \
$$_javascript_CORE_GENERATED_SOURCES_DIR
+# Pick up the right version of LLIntAssembly.h
+macx: INCLUDEPATH += $$_javascript_CORE_GENERATED_SOURCES_DIR/$$activeBuildConfig()
+
win32-*: LIBS += -lwinmm
wince* {
Modified: trunk/Source/WebKit2/ChangeLog (136298 => 136299)
--- trunk/Source/WebKit2/ChangeLog 2012-12-01 00:53:01 UTC (rev 136298)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-01 01:19:09 UTC (rev 136299)
@@ -1,3 +1,11 @@
+2012-11-30 Pierre Rossi <[email protected]>
+
+ [Qt] Unreviewed speculative Mac build fix after r136232
+
+ cleanup an oversight from r136235
+
+ * PluginProcess.pro: s/webkit/webkitwidgets/
+
2012-11-30 Brent Fulgham <[email protected]>
[Windows, WinCairo] Generate library export symbol file.
Modified: trunk/Source/WebKit2/PluginProcess.pro (136298 => 136299)
--- trunk/Source/WebKit2/PluginProcess.pro 2012-12-01 00:53:01 UTC (rev 136298)
+++ trunk/Source/WebKit2/PluginProcess.pro 2012-12-01 01:19:09 UTC (rev 136299)
@@ -6,7 +6,7 @@
TEMPLATE = app
-QT += webkitwidgets
+QT += webkit
TARGET = QtWebPluginProcess
DESTDIR = $${ROOT_BUILD_DIR}/bin
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
