Title: [141097] trunk/Source/_javascript_Core
- Revision
- 141097
- Author
- jocelyn.turco...@digia.com
- Date
- 2013-01-29 04:34:41 -0800 (Tue, 29 Jan 2013)
Log Message
[Qt] Fix the JSC build on Mac
Unreviewed, build fix.
* heap/HeapTimer.h:
Qt on Mac has USE(CF) true, and should use the CF HeapTimer in that case.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (141096 => 141097)
--- trunk/Source/_javascript_Core/ChangeLog 2013-01-29 12:01:39 UTC (rev 141096)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-01-29 12:34:41 UTC (rev 141097)
@@ -1,3 +1,12 @@
+2013-01-29 Jocelyn Turcotte <jocelyn.turco...@digia.com>
+
+ [Qt] Fix the JSC build on Mac
+
+ Unreviewed, build fix.
+
+ * heap/HeapTimer.h:
+ Qt on Mac has USE(CF) true, and should use the CF HeapTimer in that case.
+
2013-01-29 Allan Sandfeld Jensen <allan.jen...@digia.com>
[Qt] Implement IncrementalSweeper and HeapTimer
Modified: trunk/Source/_javascript_Core/heap/HeapTimer.h (141096 => 141097)
--- trunk/Source/_javascript_Core/heap/HeapTimer.h 2013-01-29 12:01:39 UTC (rev 141096)
+++ trunk/Source/_javascript_Core/heap/HeapTimer.h 2013-01-29 12:34:41 UTC (rev 141097)
@@ -44,7 +44,7 @@
class JSGlobalData;
-#if PLATFORM(QT)
+#if PLATFORM(QT) && !USE(CF)
class HeapTimer : public QObject {
#else
class HeapTimer {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
