From 3769646dd3e925b58625eace216a964fea5bf7f4 Mon Sep 17 00:00:00 2001 From: Jani Uusi-Rantala Date: Tue, 6 Sep 2011 18:35:38 +0300 Subject: Clang build fix: QPixmap::init -> QPixmap::doInit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QPixmap::init shadows base class QPaintDevice::init with different declaration which makes latest clang builds fail on modules. Simple renaming of this private function fixes the issue. Change-Id: I65b2b09e81f4833dc9b54b36423ba7c15d9ded4f Reviewed-on: http://codereview.qt.nokia.com/4289 Reviewed-by: Qt Sanity Bot Reviewed-by: Samuel Rødal --- src/gui/image/qpixmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gui/image/qpixmap.h') diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index 330370e25b..5d300d1f76 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -175,7 +175,7 @@ private: bool doImageIO(QImageWriter *io, int quality) const; QPixmap(const QSize &s, int type); - void init(int, int, int); + void doInit(int, int, int); void deref(); Q_DUMMY_COMPARISON_OPERATOR(QPixmap) friend class QPlatformPixmap; -- cgit v1.2.3