diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 08:52:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 08:52:15 (GMT) |
| commit | c45ce66ce417718e09de276bfdb663aa5e9fe366 (patch) | |
| tree | 96b86e19acda8602c3c77be233772c732ad7a790 | |
| parent | c4b8a1a818b285ab3b25744fbf35cb1eb43b5dbd (diff) | |
| parent | 966768a637a607abd9c26917e62be994c397864f (diff) | |
| download | Qt-c45ce66ce417718e09de276bfdb663aa5e9fe366.zip Qt-c45ce66ce417718e09de276bfdb663aa5e9fe366.tar.gz Qt-c45ce66ce417718e09de276bfdb663aa5e9fe366.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix a crash in QGtkStyle when theme not available
| -rw-r--r-- | src/gui/styles/qgtkstyle.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp index b5f052b..ddae3d8 100644 --- a/src/gui/styles/qgtkstyle.cpp +++ b/src/gui/styles/qgtkstyle.cpp @@ -3398,6 +3398,9 @@ QRect QGtkStyle::subElementRect(SubElement element, const QStyleOption *option, Q_D(const QGtkStyle); QRect r = QCleanlooksStyle::subElementRect(element, option, widget); + if (!d->isThemeAvailable()) + return r; + switch (element) { case SE_ProgressBarLabel: case SE_ProgressBarContents: |