summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-09-28 02:27:22 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2009-09-28 02:27:22 (GMT)
commitbc3c50513a8f8cdb07029ec363a3f2fce9a425b1 (patch)
tree9b26f985ccaab422bfa37bbfb0735fd604cac985 /src
parent4ab6abe2d460cd9c36b92ad7c390fcad9edb5b35 (diff)
parent802a2929a4218987a7a351802f63d2c0f2300bb2 (diff)
downloadQt-bc3c50513a8f8cdb07029ec363a3f2fce9a425b1.zip
Qt-bc3c50513a8f8cdb07029ec363a3f2fce9a425b1.tar.gz
Qt-bc3c50513a8f8cdb07029ec363a3f2fce9a425b1.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src')
-rw-r--r--src/multimedia/audio/qaudiooutput_win32_p.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/multimedia/audio/qaudiooutput_win32_p.h b/src/multimedia/audio/qaudiooutput_win32_p.h
index 68f418e..5c08bf4 100644
--- a/src/multimedia/audio/qaudiooutput_win32_p.h
+++ b/src/multimedia/audio/qaudiooutput_win32_p.h
@@ -104,10 +104,6 @@ private slots:
void feedback();
bool deviceReady();
-signals:
- void stateChanged(QAudio::State);
- void notify();
-
private:
QByteArray m_device;
bool resuming;