From 86802ec04d23c8ddc82268e18eb99d5f71450914 Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Thu, 26 Jun 2014 11:02:59 +0300 Subject: [PATCH] Fix inconsistent export in QPixmapIconEngine Removes "warning C4273: 'operator <<' : inconsistent dll linkage" under MSVC2013. Change-Id: I463441802a76f02db329631947232c70a85ae9e7 Reviewed-by: Olivier Goffart --- src/gui/image/qicon_p.h | 4 ++-- 1 file 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 pixmaps; - friend QDataStream &operator<<(QDataStream &s, const QIcon &icon); + friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &s, const QIcon &icon); friend class QIconThemeEngine; };