diff options
| author | Jani Uusi-Rantala <jani.uusi-rantala@nokia.com> | 2011-09-06 18:35:38 +0300 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-09-07 07:49:57 +0200 |
| commit | 3769646dd3e925b58625eace216a964fea5bf7f4 (patch) | |
| tree | 6f8071d7459181e8358f1977b778ae106bb9e7b8 /src/gui/image/qpixmap.h | |
| parent | 5234824e8f767ffd5dbaa898d7415f2ba2a900c9 (diff) | |
Clang build fix: QPixmap::init -> QPixmap::doInit
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 <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/gui/image/qpixmap.h')
| -rw-r--r-- | src/gui/image/qpixmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; |