summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2009-06-17 10:02:24 (GMT)
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2009-06-17 10:02:24 (GMT)
commit3a55f0eab402a72a0f98fdfe5505614fed5d19ed (patch)
tree987e5690afc1ca2b51e50dd10345be28294d3751 /src/3rdparty
parentc4551c5df74bcd7e6166ce502832704b9495c685 (diff)
parenteda6ef48f7a1c5f93e09fd85fa54123569bb0a5f (diff)
downloadQt-3a55f0eab402a72a0f98fdfe5505614fed5d19ed.zip
Qt-3a55f0eab402a72a0f98fdfe5505614fed5d19ed.tar.gz
Qt-3a55f0eab402a72a0f98fdfe5505614fed5d19ed.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/phonon/phonon/volumeslider.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/phonon/volumeslider.cpp b/src/3rdparty/phonon/phonon/volumeslider.cpp
index b59f689..1888cb6 100644
--- a/src/3rdparty/phonon/phonon/volumeslider.cpp
+++ b/src/3rdparty/phonon/phonon/volumeslider.cpp
@@ -85,7 +85,7 @@ VolumeSlider::~VolumeSlider()
bool VolumeSlider::isMuteVisible() const
{
- return k_ptr->muteButton.isVisible();
+ return !k_ptr->muteButton.isHidden();
}
void VolumeSlider::setMuteVisible(bool visible)