diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-21 09:44:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-21 09:44:02 (GMT) |
| commit | d0cc0f02aa0ea2ac2a90fb19f53de37a5cad56d6 (patch) | |
| tree | 1ea0702974cd5d56d80285c38903aaf61eafa283 /tools | |
| parent | 513d6bd7388e27f32b2868ded6174ca84212cd1b (diff) | |
| parent | f6f4e2b73391dcc24382583f9c52f09bb4ced37a (diff) | |
| download | Qt-d0cc0f02aa0ea2ac2a90fb19f53de37a5cad56d6.zip Qt-d0cc0f02aa0ea2ac2a90fb19f53de37a5cad56d6.tar.gz Qt-d0cc0f02aa0ea2ac2a90fb19f53de37a5cad56d6.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Designer: Fixed a crash when previewing in a non-existent style.
uic3: Introduced option to preserve layout object names of Designer 3.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/designer/src/lib/shared/widgetfactory.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/designer/src/lib/shared/widgetfactory.cpp b/tools/designer/src/lib/shared/widgetfactory.cpp index eda551d..c7b13a1 100644 --- a/tools/designer/src/lib/shared/widgetfactory.cpp +++ b/tools/designer/src/lib/shared/widgetfactory.cpp @@ -774,6 +774,8 @@ void WidgetFactory::applyStyleTopLevel(const QString &styleName, QWidget *w) void WidgetFactory::applyStyleToTopLevel(QStyle *style, QWidget *widget) { + if (!style) + return; const QPalette standardPalette = style->standardPalette(); if (widget->style() == style && widget->palette() == standardPalette) return; |