forked from qt-creator/qt-creator
QmlDesigner: Fix crash
Task-number: QDS-9009 Change-Id: Id2c862e1890ecfc0f2d14bf58eb6cb4c5112d0ba Reviewed-by: Burak Hancerli <burak.hancerli@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
@@ -636,7 +636,7 @@ QLinearGradient StyleHelper::statusBarGradient(const QRect &statusBarRect)
|
|||||||
|
|
||||||
bool StyleHelper::isQDSTheme()
|
bool StyleHelper::isQDSTheme()
|
||||||
{
|
{
|
||||||
return creatorTheme()->flag(Theme::QDSTheme);
|
return creatorTheme() ? creatorTheme()->flag(Theme::QDSTheme) : false;
|
||||||
}
|
}
|
||||||
|
|
||||||
QIcon StyleHelper::getIconFromIconFont(const QString &fontName, const QList<IconFontHelper> ¶meters)
|
QIcon StyleHelper::getIconFromIconFont(const QString &fontName, const QList<IconFontHelper> ¶meters)
|
||||||
|
|||||||
@@ -91,6 +91,9 @@ Theme::Theme(Theme *originTheme, QObject *parent)
|
|||||||
|
|
||||||
Theme::~Theme()
|
Theme::~Theme()
|
||||||
{
|
{
|
||||||
|
if (this == m_creatorTheme)
|
||||||
|
m_creatorTheme = nullptr;
|
||||||
|
|
||||||
delete d;
|
delete d;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user