diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-11 01:00:56 +0100 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-03-11 15:34:21 +0100 |
| commit | 865afac25036d58b18794384e37d42931b2164c5 (patch) | |
| tree | e18d31138f1a8b9200764fd3648e58b9dd6b124f /src/widgets/styles | |
| parent | 01bacdf7abb071198d843acdfb22ce1701766be8 (diff) | |
| parent | 52de905d0ec6159d3a1e7ad63fed018b5c6973d2 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ibee5acec72a1a1769d4bc5f23f56c7dc8d4cf3cb
Diffstat (limited to 'src/widgets/styles')
| -rw-r--r-- | src/widgets/styles/qcommonstyle.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/styles/qfusionstyle.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/styles/qstylesheetstyle.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/styles/qwindowsstyle.cpp | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 4b0094e578..45ac6712b4 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -6125,7 +6125,7 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption const QString cacheKey = QLatin1String("qt_mac_constructQIconFromIconRef") + QString::number(standardIcon) + QString::number(size.width()); if (standardIcon >= QStyle::SP_CustomBase) { mainIcon = theme->standardPixmap(sp, QSizeF(size)); - } else if (QPixmapCache::find(cacheKey, mainIcon) == false) { + } else if (QPixmapCache::find(cacheKey, &mainIcon) == false) { mainIcon = theme->standardPixmap(sp, QSizeF(size)); QPixmapCache::insert(cacheKey, mainIcon); } diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index 4427d69944..2a0d6d1b40 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -52,6 +52,7 @@ #include <qabstractbutton.h> #endif #include <qpainter.h> +#include <qpainterpath.h> #include <qdir.h> #include <qstyleoption.h> #include <qapplication.h> diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 1e032b237a..b07abe4f51 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -118,6 +118,7 @@ #include <QtWidgets/qtoolbar.h> #endif +#include <QtGui/qpainterpath.h> #include <QtGui/qscreen.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp index 4965d146b0..e275e3a714 100644 --- a/src/widgets/styles/qwindowsstyle.cpp +++ b/src/widgets/styles/qwindowsstyle.cpp @@ -78,6 +78,7 @@ #endif #include <private/qmath_p.h> #include <qmath.h> +#include <QtGui/qpainterpath.h> #include <QtGui/qscreen.h> #include <QtGui/qwindow.h> #include <qpa/qplatformtheme.h> |