From 265ea52327f31d522042c2515889650e002a4ca4 Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Thu, 30 Dec 2010 23:47:48 +0000 Subject: [PATCH] 2010-12-30 Konstantin Tokarev Reviewed by David Kilzer. [Qt] Don't build wtf/TCSystemAlloc.cpp if --system-malloc option is used https://bugs.webkit.org/show_bug.cgi?id=51672 * WebKit.pri: Replaced USE_SYSTEM_MALLOC with USE_SYSTEM_MALLOC=1 2010-12-30 Konstantin Tokarev Reviewed by David Kilzer. [Qt] Don't build wtf/TCSystemAlloc.cpp if --system-malloc option is used https://bugs.webkit.org/show_bug.cgi?id=51672 * wtf/wtf.pri: Replaced USE_SYSTEM_MALLOC with USE_SYSTEM_MALLOC=1 2010-12-30 Konstantin Tokarev Reviewed by David Kilzer. [Qt] Don't build wtf/TCSystemAlloc.cpp if --system-malloc option is used https://bugs.webkit.org/show_bug.cgi?id=51672 * DumpRenderTree/qt/DumpRenderTree.pro: Replaced USE_SYSTEM_MALLOC with USE_SYSTEM_MALLOC=1 * WebKitTestRunner/qt/WebKitTestRunner.pro: Replaced USE_SYSTEM_MALLOC with USE_SYSTEM_MALLOC=1 git-svn-id: https://svn.webkit.org/repository/webkit/trunk@74813 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 10 ++++++++++ JavaScriptCore/ChangeLog | 10 ++++++++++ JavaScriptCore/wtf/wtf.pri | 2 +- Tools/ChangeLog | 13 +++++++++++++ Tools/DumpRenderTree/qt/DumpRenderTree.pro | 2 +- Tools/WebKitTestRunner/qt/WebKitTestRunner.pro | 2 +- WebKit.pri | 4 ++-- 7 files changed, 38 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 998f0a3..b12ab6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2010-12-30 Konstantin Tokarev + + Reviewed by David Kilzer. + + [Qt] Don't build wtf/TCSystemAlloc.cpp if --system-malloc option is + used + https://bugs.webkit.org/show_bug.cgi?id=51672 + + * WebKit.pri: Replaced USE_SYSTEM_MALLOC with USE_SYSTEM_MALLOC=1 + 2010-12-29 Philippe Normand Reviewed by Martin Robinson. diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog index 5b7aa2a..f8edc56 100644 --- a/JavaScriptCore/ChangeLog +++ b/JavaScriptCore/ChangeLog @@ -1,3 +1,13 @@ +2010-12-30 Konstantin Tokarev + + Reviewed by David Kilzer. + + [Qt] Don't build wtf/TCSystemAlloc.cpp if --system-malloc option is + used + https://bugs.webkit.org/show_bug.cgi?id=51672 + + * wtf/wtf.pri: Replaced USE_SYSTEM_MALLOC with USE_SYSTEM_MALLOC=1 + 2010-12-30 Patrick Gansterer Reviewed by Darin Adler. diff --git a/JavaScriptCore/wtf/wtf.pri b/JavaScriptCore/wtf/wtf.pri index c5617ce..c1af024 100644 --- a/JavaScriptCore/wtf/wtf.pri +++ b/JavaScriptCore/wtf/wtf.pri @@ -41,7 +41,7 @@ contains(DEFINES, USE_GSTREAMER=1) { CONFIG += link_pkgconfig } -!contains(DEFINES, USE_SYSTEM_MALLOC) { +!contains(DEFINES, USE_SYSTEM_MALLOC=1) { SOURCES += wtf/TCSystemAlloc.cpp } diff --git a/Tools/ChangeLog b/Tools/ChangeLog index bcf0e37..4b017be 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,16 @@ +2010-12-30 Konstantin Tokarev + + Reviewed by David Kilzer. + + [Qt] Don't build wtf/TCSystemAlloc.cpp if --system-malloc option is + used + https://bugs.webkit.org/show_bug.cgi?id=51672 + + * DumpRenderTree/qt/DumpRenderTree.pro: Replaced USE_SYSTEM_MALLOC + with USE_SYSTEM_MALLOC=1 + * WebKitTestRunner/qt/WebKitTestRunner.pro: Replaced USE_SYSTEM_MALLOC + with USE_SYSTEM_MALLOC=1 + 2010-12-30 Laszlo Gombos Reviewed by David Kilzer. diff --git a/Tools/DumpRenderTree/qt/DumpRenderTree.pro b/Tools/DumpRenderTree/qt/DumpRenderTree.pro index e8831a3..5060511 100644 --- a/Tools/DumpRenderTree/qt/DumpRenderTree.pro +++ b/Tools/DumpRenderTree/qt/DumpRenderTree.pro @@ -50,4 +50,4 @@ wince*: { LIBS += $$WCECOMPAT/lib/wcecompat.lib } -DEFINES+=USE_SYSTEM_MALLOC +DEFINES += USE_SYSTEM_MALLOC=1 diff --git a/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro b/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro index cf5d5b8..3d8b76c 100644 --- a/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro +++ b/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro @@ -14,7 +14,7 @@ include(../../../WebKit.pri) OBJECTS_DIR = obj/release } -DEFINES += USE_SYSTEM_MALLOC +DEFINES += USE_SYSTEM_MALLOC=1 INCLUDEPATH += \ $$BASEDIR \ diff --git a/WebKit.pri b/WebKit.pri index 6b01b49..aec91e5 100644 --- a/WebKit.pri +++ b/WebKit.pri @@ -48,7 +48,7 @@ building-libs { } !mac:!unix|symbian { - DEFINES += USE_SYSTEM_MALLOC + DEFINES += USE_SYSTEM_MALLOC=1 } CONFIG(release, debug|release) { @@ -88,7 +88,7 @@ valgrind { contains(JAVASCRIPTCORE_JIT,yes): error("'JAVASCRIPTCORE_JIT=yes' not supported with valgrind") QMAKE_CXXFLAGS += -g QMAKE_LFLAGS += -g - DEFINES += USE_SYSTEM_MALLOC + DEFINES += USE_SYSTEM_MALLOC=1 DEFINES += ENABLE_JIT=0 JAVASCRIPTCORE_JIT = no } -- 1.8.3.1