Title: [100265] trunk/Tools
- Revision
- 100265
- Author
- [email protected]
- Date
- 2011-11-15 03:33:33 -0800 (Tue, 15 Nov 2011)
Log Message
[Qt] Unreviewed prospective --minimal build fix.
* DumpRenderTree/qt/DumpRenderTree.pro: Avoid USE_SYSTEM_MALLOC=0
and USE_SYSTEM_MALLOC=1 appearing in DEFINES at the same time.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (100264 => 100265)
--- trunk/Tools/ChangeLog 2011-11-15 11:30:46 UTC (rev 100264)
+++ trunk/Tools/ChangeLog 2011-11-15 11:33:33 UTC (rev 100265)
@@ -1,5 +1,12 @@
2011-11-15 Simon Hausmann <[email protected]>
+ [Qt] Unreviewed prospective --minimal build fix.
+
+ * DumpRenderTree/qt/DumpRenderTree.pro: Avoid USE_SYSTEM_MALLOC=0
+ and USE_SYSTEM_MALLOC=1 appearing in DEFINES at the same time.
+
+2011-11-15 Simon Hausmann <[email protected]>
+
[Qt] Unreviewed --minimal build fix.
* Scripts/build-webkit: Add to DEFINES+= from @options only if there is
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro (100264 => 100265)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2011-11-15 11:30:46 UTC (rev 100264)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2011-11-15 11:33:33 UTC (rev 100265)
@@ -53,6 +53,7 @@
LIBS += $$WCECOMPAT/lib/wcecompat.lib
}
+DEFINES -= USE_SYSTEM_MALLOC=0
DEFINES += USE_SYSTEM_MALLOC=1
RESOURCES = DumpRenderTree.qrc
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
