diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2014-04-11 19:46:37 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-06 08:23:32 (GMT) |
| commit | 0425cf88f3935858ec1ee13ac3e67a90b3f3e45f (patch) | |
| tree | b6254cf857372ecea51596f72bb9ed245e03c6db | |
| parent | 248fb5b7f084c4ae81ea6b5a366a93e882930641 (diff) | |
| download | Qt-0425cf88f3935858ec1ee13ac3e67a90b3f3e45f.zip Qt-0425cf88f3935858ec1ee13ac3e67a90b3f3e45f.tar.gz Qt-0425cf88f3935858ec1ee13ac3e67a90b3f3e45f.tar.bz2 | |
Don't use QAbstractButton::pixmap() as this will always return 0.
Instead of using pixmap() we use icon() instead which is what the
extension menu is after in this case.
Task-number: QTBUG-38301
Change-Id: I2c238b50b0fcf04318100d2d6d39f563ef3eff5b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| -rw-r--r-- | src/qt3support/widgets/q3toolbar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt3support/widgets/q3toolbar.cpp b/src/qt3support/widgets/q3toolbar.cpp index 699e7a2..f4a76b0 100644 --- a/src/qt3support/widgets/q3toolbar.cpp +++ b/src/qt3support/widgets/q3toolbar.cpp @@ -657,8 +657,8 @@ void Q3ToolBar::createPopup() QString s = b->text(); if (s.isEmpty()) s = QLatin1String(""); - if (b->pixmap()) - id = d->extensionPopup->insertItem(*b->pixmap(), s, b, SLOT(click())); + if (!b->icon().isNull()) + id = d->extensionPopup->insertItem(b->icon(), s, b, SLOT(click())); else id = d->extensionPopup->insertItem(s, b, SLOT(click())); if (b->isToggleButton()) |