summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit
diff options
context:
space:
mode:
authorAndreas Kling <andreas.kling@nokia.com>2011-06-08 12:23:24 (GMT)
committerAndreas Kling <andreas.kling@nokia.com>2011-06-08 12:23:24 (GMT)
commit22a5430be94a29804b8674b1e630d09095cd9cf9 (patch)
treec2d2ab19f1cc309a3ec98cb26facddd759ee6196 /src/3rdparty/webkit
parent57f1d9ff565367a19126579fce41f162ee9005d8 (diff)
downloadQt-22a5430be94a29804b8674b1e630d09095cd9cf9.zip
Qt-22a5430be94a29804b8674b1e630d09095cd9cf9.tar.gz
Qt-22a5430be94a29804b8674b1e630d09095cd9cf9.tar.bz2
Hack RenderBlock's continuation() and setContinuation() for RVCT 2.x.
Diffstat (limited to 'src/3rdparty/webkit')
-rw-r--r--src/3rdparty/webkit/Source/WebCore/rendering/RenderBlock.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderBlock.h b/src/3rdparty/webkit/Source/WebCore/rendering/RenderBlock.h
index 68e2d80..e27068c 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderBlock.h
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderBlock.h
@@ -147,8 +147,8 @@ public:
RenderInline* inlineElementContinuation() const;
RenderBlock* blockElementContinuation() const;
- using RenderBoxModelObject::continuation;
- using RenderBoxModelObject::setContinuation;
+ RenderBoxModelObject* continuation() const { return RenderBoxModelObject::continuation(); }
+ void setContinuation(RenderBoxModelObject* o) { RenderBoxModelObject::setContinuation(o); }
// This function is a convenience helper for creating an anonymous block that inherits its
// style from this RenderBlock.