Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraphicssceneindex

1 files changed, 23 insertions, 0 deletions

diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp
index c1a69f7..f04a4d7 100644
--- a/tests/auto/mediaobject/tst_mediaobject.cpp
+++ b/tests/auto/mediaobject/tst_mediaobject.cpp
@@ -148,6 +148,7 @@ class tst_MediaObject : public QObject
         void testPlayBeforeFinish();
         void testPauseOnFinish();
         void testReconnectBetweenTwoMediaObjects();
+        void volumeSliderMuteVisibility();
         void cleanupTestCase();
     private:
         void _startPlayback(Phonon::State currentState = Phonon::StoppedState);
@@ -937,6 +938,28 @@ void tst_MediaObject::_testOneSeek(qint64 seekTo)
     m_success = true;
 }
 
+void tst_MediaObject::volumeSliderMuteVisibility()
+{
+    //this test doesn't really belong to mediaobject
+    // ### see if we should create a realy Phonon::VolumeSlider autotest
+    Phonon::VolumeSlider slider;
+    QVERIFY(slider.isMuteVisible()); // that is the default value
+    slider.setMuteVisible(true);
+    QVERIFY(slider.isMuteVisible());
+
+    //let's check that changing the visibility of the slider itself
+    //doesn't change what the slider reports
+    slider.setVisible(false);
+    QVERIFY(slider.isMuteVisible());
+    slider.setVisible(true);
+
+    slider.setMuteVisible(false);
+    QVERIFY(!slider.isMuteVisible());
+    slider.setMuteVisible(true);
+    QVERIFY(slider.isMuteVisible());
+}
+
+
 #endif //QT_NO_PHONON