1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QStyleSheetStyle: mark QRenderRule and ButtonInfo movable

Browse Source 
Because they are.

Change-Id: Iab029e4b120f10efc99d62960b88fbba7603cc1b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
Marc Mutz 2015-06-24 21:45:37 +02:00
parent a3f780b4a1
commit b31923c5e5
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/styles/qstylesheetstyle.cpp
View File

@ -586,6 +586,7 @@ public:
int clipset; int clipset;
QPainterPath clipPath; QPainterPath clipPath;
}; };
Q_DECLARE_TYPEINFO(QRenderRule, Q_MOVABLE_TYPE);
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
static const char *const knownStyleHints[] = { static const char *const knownStyleHints[] = {
@ -730,6 +731,7 @@ namespace {
int width; int width;
}; };
} }
template <> class QTypeInfo<ButtonInfo> : public QTypeInfoMerger<ButtonInfo, QRenderRule, int> {};
QHash<QStyle::SubControl, QRect> QStyleSheetStyle::titleBarLayout(const QWidget *w, const QStyleOptionTitleBar *tb) const QHash<QStyle::SubControl, QRect> QStyleSheetStyle::titleBarLayout(const QWidget *w, const QStyleOptionTitleBar *tb) const
{ {