diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2014-06-26 11:02:59 +0300 |
|---|---|---|
| committer | Andrew Knight <andrew.knight@digia.com> | 2014-06-26 16:21:58 +0200 |
| commit | 86802ec04d23c8ddc82268e18eb99d5f71450914 (patch) | |
| tree | 17e80e627250fcfb08011f39c13d4ad73e76380e /src/gui/image | |
| parent | 39592980248793a1368a4bf672597938f506949c (diff) | |
Fix inconsistent export in QPixmapIconEngine
Removes "warning C4273: 'operator <<' : inconsistent dll linkage" under
MSVC2013.
Change-Id: I463441802a76f02db329631947232c70a85ae9e7
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qicon_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/image/qicon_p.h b/src/gui/image/qicon_p.h index a46cc310ad..7351ad489a 100644 --- a/src/gui/image/qicon_p.h +++ b/src/gui/image/qicon_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -121,7 +121,7 @@ private: QPixmapIconEngineEntry *tryMatch(const QSize &size, QIcon::Mode mode, QIcon::State state); QVector<QPixmapIconEngineEntry> pixmaps; - friend QDataStream &operator<<(QDataStream &s, const QIcon &icon); + friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &s, const QIcon &icon); friend class QIconThemeEngine; }; |