[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[jocelyn.turcotte at nokia.com]

The following commit has been merged in the webkit-1.2 branch:
commit 45ad0bfcd244b4f527ac27491963712b393f71c4
Author: jocelyn.turcotte at nokia.com <jocelyn.turcotte at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 14 13:19:00 2010 +0000

    [Qt] Unreviewed fix of builds with the --no-svg switch.
    
    * WebCore.pri:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53261 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 45ffc65..d7304b8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,11 @@
 2010-01-14  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
 
+        [Qt] Unreviewed fix of builds with the --no-svg switch.
+
+        * WebCore.pri:
+
+2010-01-14  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
         [Qt] Unreviewed build fix on Windows.
 
         * platform/graphics/transforms/TransformationMatrix.h:
diff --git a/WebCore/WebCore.pri b/WebCore/WebCore.pri
index 9113144..104cc32 100644
--- a/WebCore/WebCore.pri
+++ b/WebCore/WebCore.pri
@@ -556,12 +556,14 @@ contains(DEFINES, ENABLE_WML=1) {
     addExtraCompiler(wmlnames)
 }
 
-# GENERATOR 5-C:
-svgnames.output = $${WC_GENERATED_SOURCES_DIR}/SVGNames.cpp
-svgnames.input = SVG_NAMES
-svgnames.commands = perl -I$$PWD/bindings/scripts $$PWD/dom/make_names.pl --tags $$PWD/svg/svgtags.in --attrs $$PWD/svg/svgattrs.in --extraDefines \"$${DEFINES}\" --preprocessor \"$${QMAKE_MOC} -E\" --factory --wrapperFactory --outputDir $$WC_GENERATED_SOURCES_DIR
-svgnames.wkExtraSources = $${WC_GENERATED_SOURCES_DIR}/SVGElementFactory.cpp $${WC_GENERATED_SOURCES_DIR}/JSSVGElementWrapperFactory.cpp
-addExtraCompiler(svgnames)
+contains(DEFINES, ENABLE_SVG=1) {
+    # GENERATOR 5-C:
+    svgnames.output = $${WC_GENERATED_SOURCES_DIR}/SVGNames.cpp
+    svgnames.input = SVG_NAMES
+    svgnames.commands = perl -I$$PWD/bindings/scripts $$PWD/dom/make_names.pl --tags $$PWD/svg/svgtags.in --attrs $$PWD/svg/svgattrs.in --extraDefines \"$${DEFINES}\" --preprocessor \"$${QMAKE_MOC} -E\" --factory --wrapperFactory --outputDir $$WC_GENERATED_SOURCES_DIR
+    svgnames.wkExtraSources = $${WC_GENERATED_SOURCES_DIR}/SVGElementFactory.cpp $${WC_GENERATED_SOURCES_DIR}/JSSVGElementWrapperFactory.cpp
+    addExtraCompiler(svgnames)
+}
 
 # GENERATOR 5-D:
 xlinknames.output = $${WC_GENERATED_SOURCES_DIR}/XLinkNames.cpp

-- 
WebKit Debian packaging