Title: [121147] trunk
- Revision
- 121147
- Author
- [email protected]
- Date
- 2012-06-25 04:21:06 -0700 (Mon, 25 Jun 2012)
Log Message
[Qt] Fix Win32 debug build
Reviewed by Tor Arne Vestbø.
Source/WebCore:
Consistently use use_all_in_one_files when requested in the configuration. The previous
Linux condition has been moved to Tools/qmake/mkspecs/features/unix/default_pre.prf
* Target.pri:
Tools:
Consolidate use_all_in_one_files into mac/unix/win32 default_pre.prf.
* qmake/mkspecs/features/unix/default_pre.prf:
* qmake/mkspecs/features/win32/default_pre.prf: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (121146 => 121147)
--- trunk/Source/WebCore/ChangeLog 2012-06-25 10:31:06 UTC (rev 121146)
+++ trunk/Source/WebCore/ChangeLog 2012-06-25 11:21:06 UTC (rev 121147)
@@ -1,3 +1,14 @@
+2012-06-25 Simon Hausmann <[email protected]>
+
+ [Qt] Fix Win32 debug build
+
+ Reviewed by Tor Arne Vestbø.
+
+ Consistently use use_all_in_one_files when requested in the configuration. The previous
+ Linux condition has been moved to Tools/qmake/mkspecs/features/unix/default_pre.prf
+
+ * Target.pri:
+
2012-06-25 Philip Rogers <[email protected]>
Fix rewinding of SVG animations
Modified: trunk/Source/WebCore/Target.pri (121146 => 121147)
--- trunk/Source/WebCore/Target.pri 2012-06-25 10:31:06 UTC (rev 121146)
+++ trunk/Source/WebCore/Target.pri 2012-06-25 11:21:06 UTC (rev 121147)
@@ -3547,7 +3547,7 @@
svg/properties/SVGAttributeToPropertyMap.cpp \
svg/properties/SVGPathSegListPropertyTearOff.cpp
- linux-g++*:CONFIG(debug, debug|release):isEqual(QT_ARCH,i386) {
+ use_all_in_one_files {
# Using all in one files to avoid memory exhaustion
# during the linking phase.
SOURCES += \
@@ -3602,167 +3602,162 @@
rendering/svg/SVGTextMetrics.cpp \
rendering/svg/SVGTextMetricsBuilder.cpp \
rendering/svg/SVGTextQuery.cpp \
- rendering/svg/SVGTextRunRenderingContext.cpp
- use_all_in_one_files {
- SOURCES += svg/SVGAllInOne.cpp
- } else {
- SOURCES += \
- svg/SVGDocumentExtensions.cpp \
- svg/ColorDistance.cpp \
- svg/SVGAElement.cpp \
- svg/SVGAltGlyphDefElement.cpp \
- svg/SVGAltGlyphElement.cpp \
- svg/SVGAltGlyphItemElement.cpp \
- svg/SVGAngle.cpp \
- svg/SVGAnimateColorElement.cpp \
- svg/SVGAnimatedAngle.cpp \
- svg/SVGAnimatedBoolean.cpp \
- svg/SVGAnimatedColor.cpp \
- svg/SVGAnimatedEnumeration.cpp \
- svg/SVGAnimatedInteger.cpp \
- svg/SVGAnimatedIntegerOptionalInteger.cpp \
- svg/SVGAnimatedLength.cpp \
- svg/SVGAnimatedLengthList.cpp \
- svg/SVGAnimatedNumber.cpp \
- svg/SVGAnimatedNumberList.cpp \
- svg/SVGAnimatedNumberOptionalNumber.cpp \
- svg/SVGAnimatedPath.cpp \
- svg/SVGAnimatedPointList.cpp \
- svg/SVGAnimatedPreserveAspectRatio.cpp \
- svg/SVGAnimatedRect.cpp \
- svg/SVGAnimatedString.cpp \
- svg/SVGAnimatedTransformList.cpp \
- svg/SVGAnimatedType.cpp \
- svg/SVGAnimateElement.cpp \
- svg/SVGAnimateMotionElement.cpp \
- svg/SVGAnimateTransformElement.cpp \
- svg/SVGAnimationElement.cpp \
- svg/SVGCircleElement.cpp \
- svg/SVGClipPathElement.cpp \
- svg/SVGColor.cpp \
- svg/SVGComponentTransferFunctionElement.cpp \
- svg/SVGCursorElement.cpp \
- svg/SVGDefsElement.cpp \
- svg/SVGDescElement.cpp \
- svg/SVGDocument.cpp \
- svg/SVGElement.cpp \
- svg/SVGElementInstance.cpp \
- svg/SVGElementInstanceList.cpp \
- svg/SVGEllipseElement.cpp \
- svg/SVGException.cpp \
- svg/SVGExternalResourcesRequired.cpp \
- svg/SVGFEBlendElement.cpp \
- svg/SVGFEColorMatrixElement.cpp \
- svg/SVGFEComponentTransferElement.cpp \
- svg/SVGFECompositeElement.cpp \
- svg/SVGFEConvolveMatrixElement.cpp \
- svg/SVGFEDiffuseLightingElement.cpp \
- svg/SVGFEDisplacementMapElement.cpp \
- svg/SVGFEDistantLightElement.cpp \
- svg/SVGFEDropShadowElement.cpp \
- svg/SVGFEFloodElement.cpp \
- svg/SVGFEFuncAElement.cpp \
- svg/SVGFEFuncBElement.cpp \
- svg/SVGFEFuncGElement.cpp \
- svg/SVGFEFuncRElement.cpp \
- svg/SVGFEGaussianBlurElement.cpp \
- svg/SVGFEImageElement.cpp \
- svg/SVGFELightElement.cpp \
- svg/SVGFEMergeElement.cpp \
- svg/SVGFEMergeNodeElement.cpp \
- svg/SVGFEMorphologyElement.cpp \
- svg/SVGFEOffsetElement.cpp \
- svg/SVGFEPointLightElement.cpp \
- svg/SVGFESpecularLightingElement.cpp \
- svg/SVGFESpotLightElement.cpp \
- svg/SVGFETileElement.cpp \
- svg/SVGFETurbulenceElement.cpp \
- svg/SVGFilterElement.cpp \
- svg/SVGFilterPrimitiveStandardAttributes.cpp \
- svg/SVGFitToViewBox.cpp \
- svg/SVGFontData.cpp \
- svg/SVGFontElement.cpp \
- svg/SVGFontFaceElement.cpp \
- svg/SVGFontFaceFormatElement.cpp \
- svg/SVGFontFaceNameElement.cpp \
- svg/SVGFontFaceSrcElement.cpp \
- svg/SVGFontFaceUriElement.cpp \
- svg/SVGForeignObjectElement.cpp \
- svg/SVGGElement.cpp \
- svg/SVGGlyphElement.cpp \
- svg/SVGGlyphRefElement.cpp \
- svg/SVGGradientElement.cpp \
- svg/SVGHKernElement.cpp \
- svg/SVGImageElement.cpp \
- svg/SVGImageLoader.cpp \
- svg/SVGLangSpace.cpp \
- svg/SVGLength.cpp \
- svg/SVGLengthContext.cpp \
- svg/SVGLengthList.cpp \
- svg/SVGLinearGradientElement.cpp \
- svg/SVGLineElement.cpp \
- svg/SVGLocatable.cpp \
- svg/SVGMarkerElement.cpp \
- svg/SVGMaskElement.cpp \
- svg/SVGMetadataElement.cpp \
- svg/SVGMissingGlyphElement.cpp \
- svg/SVGMPathElement.cpp \
- svg/SVGNumberList.cpp \
- svg/SVGPaint.cpp \
- svg/SVGParserUtilities.cpp \
- svg/SVGPathBlender.cpp \
- svg/SVGPathBuilder.cpp \
- svg/SVGPathByteStreamBuilder.cpp \
- svg/SVGPathByteStreamSource.cpp \
- svg/SVGPathElement.cpp \
- svg/SVGPathParser.cpp \
- svg/SVGPathSegList.cpp \
- svg/SVGPathSegListBuilder.cpp \
- svg/SVGPathSegListSource.cpp \
- svg/SVGPathStringBuilder.cpp \
- svg/SVGPathStringSource.cpp \
- svg/SVGPathTraversalStateBuilder.cpp \
- svg/SVGPathUtilities.cpp \
- svg/SVGPatternElement.cpp \
- svg/SVGPointList.cpp \
- svg/SVGPolyElement.cpp \
- svg/SVGPolygonElement.cpp \
- svg/SVGPolylineElement.cpp \
- svg/SVGPreserveAspectRatio.cpp \
- svg/SVGRadialGradientElement.cpp \
- svg/SVGRectElement.cpp \
- svg/SVGSVGElement.cpp \
- svg/SVGScriptElement.cpp \
- svg/SVGSetElement.cpp \
- svg/SVGStopElement.cpp \
- svg/SVGStringList.cpp \
- svg/SVGStylable.cpp \
- svg/SVGStyleElement.cpp \
- svg/SVGStyledElement.cpp \
- svg/SVGStyledLocatableElement.cpp \
- svg/SVGStyledTransformableElement.cpp \
- svg/SVGSwitchElement.cpp \
- svg/SVGSymbolElement.cpp \
- svg/SVGTRefElement.cpp \
- svg/SVGTSpanElement.cpp \
- svg/SVGTests.cpp \
- svg/SVGTextContentElement.cpp \
- svg/SVGTextElement.cpp \
- svg/SVGTextPathElement.cpp \
- svg/SVGTextPositioningElement.cpp \
- svg/SVGTitleElement.cpp \
- svg/SVGTransform.cpp \
- svg/SVGTransformDistance.cpp \
- svg/SVGTransformList.cpp \
- svg/SVGTransformable.cpp \
- svg/SVGURIReference.cpp \
- svg/SVGUseElement.cpp \
- svg/SVGVKernElement.cpp \
- svg/SVGViewElement.cpp \
- svg/SVGViewSpec.cpp \
- svg/SVGZoomAndPan.cpp \
- svg/SVGZoomEvent.cpp
- }
+ rendering/svg/SVGTextRunRenderingContext.cpp \
+ svg/SVGDocumentExtensions.cpp \
+ svg/ColorDistance.cpp \
+ svg/SVGAElement.cpp \
+ svg/SVGAltGlyphDefElement.cpp \
+ svg/SVGAltGlyphElement.cpp \
+ svg/SVGAltGlyphItemElement.cpp \
+ svg/SVGAngle.cpp \
+ svg/SVGAnimateColorElement.cpp \
+ svg/SVGAnimatedAngle.cpp \
+ svg/SVGAnimatedBoolean.cpp \
+ svg/SVGAnimatedColor.cpp \
+ svg/SVGAnimatedEnumeration.cpp \
+ svg/SVGAnimatedInteger.cpp \
+ svg/SVGAnimatedIntegerOptionalInteger.cpp \
+ svg/SVGAnimatedLength.cpp \
+ svg/SVGAnimatedLengthList.cpp \
+ svg/SVGAnimatedNumber.cpp \
+ svg/SVGAnimatedNumberList.cpp \
+ svg/SVGAnimatedNumberOptionalNumber.cpp \
+ svg/SVGAnimatedPath.cpp \
+ svg/SVGAnimatedPointList.cpp \
+ svg/SVGAnimatedPreserveAspectRatio.cpp \
+ svg/SVGAnimatedRect.cpp \
+ svg/SVGAnimatedString.cpp \
+ svg/SVGAnimatedTransformList.cpp \
+ svg/SVGAnimatedType.cpp \
+ svg/SVGAnimateElement.cpp \
+ svg/SVGAnimateMotionElement.cpp \
+ svg/SVGAnimateTransformElement.cpp \
+ svg/SVGAnimationElement.cpp \
+ svg/SVGCircleElement.cpp \
+ svg/SVGClipPathElement.cpp \
+ svg/SVGColor.cpp \
+ svg/SVGComponentTransferFunctionElement.cpp \
+ svg/SVGCursorElement.cpp \
+ svg/SVGDefsElement.cpp \
+ svg/SVGDescElement.cpp \
+ svg/SVGDocument.cpp \
+ svg/SVGElement.cpp \
+ svg/SVGElementInstance.cpp \
+ svg/SVGElementInstanceList.cpp \
+ svg/SVGEllipseElement.cpp \
+ svg/SVGException.cpp \
+ svg/SVGExternalResourcesRequired.cpp \
+ svg/SVGFEBlendElement.cpp \
+ svg/SVGFEColorMatrixElement.cpp \
+ svg/SVGFEComponentTransferElement.cpp \
+ svg/SVGFECompositeElement.cpp \
+ svg/SVGFEConvolveMatrixElement.cpp \
+ svg/SVGFEDiffuseLightingElement.cpp \
+ svg/SVGFEDisplacementMapElement.cpp \
+ svg/SVGFEDistantLightElement.cpp \
+ svg/SVGFEDropShadowElement.cpp \
+ svg/SVGFEFloodElement.cpp \
+ svg/SVGFEFuncAElement.cpp \
+ svg/SVGFEFuncBElement.cpp \
+ svg/SVGFEFuncGElement.cpp \
+ svg/SVGFEFuncRElement.cpp \
+ svg/SVGFEGaussianBlurElement.cpp \
+ svg/SVGFEImageElement.cpp \
+ svg/SVGFELightElement.cpp \
+ svg/SVGFEMergeElement.cpp \
+ svg/SVGFEMergeNodeElement.cpp \
+ svg/SVGFEMorphologyElement.cpp \
+ svg/SVGFEOffsetElement.cpp \
+ svg/SVGFEPointLightElement.cpp \
+ svg/SVGFESpecularLightingElement.cpp \
+ svg/SVGFESpotLightElement.cpp \
+ svg/SVGFETileElement.cpp \
+ svg/SVGFETurbulenceElement.cpp \
+ svg/SVGFilterElement.cpp \
+ svg/SVGFilterPrimitiveStandardAttributes.cpp \
+ svg/SVGFitToViewBox.cpp \
+ svg/SVGFontData.cpp \
+ svg/SVGFontElement.cpp \
+ svg/SVGFontFaceElement.cpp \
+ svg/SVGFontFaceFormatElement.cpp \
+ svg/SVGFontFaceNameElement.cpp \
+ svg/SVGFontFaceSrcElement.cpp \
+ svg/SVGFontFaceUriElement.cpp \
+ svg/SVGForeignObjectElement.cpp \
+ svg/SVGGElement.cpp \
+ svg/SVGGlyphElement.cpp \
+ svg/SVGGlyphRefElement.cpp \
+ svg/SVGGradientElement.cpp \
+ svg/SVGHKernElement.cpp \
+ svg/SVGImageElement.cpp \
+ svg/SVGImageLoader.cpp \
+ svg/SVGLangSpace.cpp \
+ svg/SVGLength.cpp \
+ svg/SVGLengthContext.cpp \
+ svg/SVGLengthList.cpp \
+ svg/SVGLinearGradientElement.cpp \
+ svg/SVGLineElement.cpp \
+ svg/SVGLocatable.cpp \
+ svg/SVGMarkerElement.cpp \
+ svg/SVGMaskElement.cpp \
+ svg/SVGMetadataElement.cpp \
+ svg/SVGMissingGlyphElement.cpp \
+ svg/SVGMPathElement.cpp \
+ svg/SVGNumberList.cpp \
+ svg/SVGPaint.cpp \
+ svg/SVGParserUtilities.cpp \
+ svg/SVGPathBlender.cpp \
+ svg/SVGPathBuilder.cpp \
+ svg/SVGPathByteStreamBuilder.cpp \
+ svg/SVGPathByteStreamSource.cpp \
+ svg/SVGPathElement.cpp \
+ svg/SVGPathParser.cpp \
+ svg/SVGPathSegList.cpp \
+ svg/SVGPathSegListBuilder.cpp \
+ svg/SVGPathSegListSource.cpp \
+ svg/SVGPathStringBuilder.cpp \
+ svg/SVGPathStringSource.cpp \
+ svg/SVGPathTraversalStateBuilder.cpp \
+ svg/SVGPathUtilities.cpp \
+ svg/SVGPatternElement.cpp \
+ svg/SVGPointList.cpp \
+ svg/SVGPolyElement.cpp \
+ svg/SVGPolygonElement.cpp \
+ svg/SVGPolylineElement.cpp \
+ svg/SVGPreserveAspectRatio.cpp \
+ svg/SVGRadialGradientElement.cpp \
+ svg/SVGRectElement.cpp \
+ svg/SVGSVGElement.cpp \
+ svg/SVGScriptElement.cpp \
+ svg/SVGSetElement.cpp \
+ svg/SVGStopElement.cpp \
+ svg/SVGStringList.cpp \
+ svg/SVGStylable.cpp \
+ svg/SVGStyleElement.cpp \
+ svg/SVGStyledElement.cpp \
+ svg/SVGStyledLocatableElement.cpp \
+ svg/SVGStyledTransformableElement.cpp \
+ svg/SVGSwitchElement.cpp \
+ svg/SVGSymbolElement.cpp \
+ svg/SVGTRefElement.cpp \
+ svg/SVGTSpanElement.cpp \
+ svg/SVGTests.cpp \
+ svg/SVGTextContentElement.cpp \
+ svg/SVGTextElement.cpp \
+ svg/SVGTextPathElement.cpp \
+ svg/SVGTextPositioningElement.cpp \
+ svg/SVGTitleElement.cpp \
+ svg/SVGTransform.cpp \
+ svg/SVGTransformDistance.cpp \
+ svg/SVGTransformList.cpp \
+ svg/SVGTransformable.cpp \
+ svg/SVGURIReference.cpp \
+ svg/SVGUseElement.cpp \
+ svg/SVGVKernElement.cpp \
+ svg/SVGViewElement.cpp \
+ svg/SVGViewSpec.cpp \
+ svg/SVGZoomAndPan.cpp \
+ svg/SVGZoomEvent.cpp
}
}
Modified: trunk/Tools/ChangeLog (121146 => 121147)
--- trunk/Tools/ChangeLog 2012-06-25 10:31:06 UTC (rev 121146)
+++ trunk/Tools/ChangeLog 2012-06-25 11:21:06 UTC (rev 121147)
@@ -1,3 +1,14 @@
+2012-06-25 Simon Hausmann <[email protected]>
+
+ [Qt] Fix Win32 debug build
+
+ Reviewed by Tor Arne Vestbø.
+
+ Consolidate use_all_in_one_files into mac/unix/win32 default_pre.prf.
+
+ * qmake/mkspecs/features/unix/default_pre.prf:
+ * qmake/mkspecs/features/win32/default_pre.prf: Added.
+
2012-06-24 Thiago Marcos P. Santos <[email protected]>
[Qt] Enable <input type="color"> support by default
Modified: trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf (121146 => 121147)
--- trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf 2012-06-25 10:31:06 UTC (rev 121146)
+++ trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf 2012-06-25 11:21:06 UTC (rev 121147)
@@ -19,4 +19,7 @@
# Make sure we process the PKGCONFIG variable if applicable
!mac: CONFIG += link_pkgconfig
+# Reduce linking memory pressure on 32-bit debug builds on Linux
+linux-g++*:CONFIG(debug, debug|release):isEqual(QT_ARCH,i386): CONFIG += use_all_in_one_files
+
load(default_pre)
Added: trunk/Tools/qmake/mkspecs/features/win32/default_pre.prf (0 => 121147)
--- trunk/Tools/qmake/mkspecs/features/win32/default_pre.prf (rev 0)
+++ trunk/Tools/qmake/mkspecs/features/win32/default_pre.prf 2012-06-25 11:21:06 UTC (rev 121147)
@@ -0,0 +1,9 @@
+# -------------------------------------------------------------------
+# Windows specific defaults
+#
+# See 'Tools/qmake/README' for an overview of the build system
+# -------------------------------------------------------------------
+
+load(default_pre)
+
+debug: CONFIG += use_all_in_one_files
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
