summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSarah Smith <sarah.j.smith@nokia.com>2009-09-28 02:06:37 (GMT)
committerSarah Smith <sarah.j.smith@nokia.com>2009-09-28 02:06:37 (GMT)
commit93e3962f3e9536d941314c02f623083f78190123 (patch)
tree31c09b3e95a81676d4c6e9b67c0f075275eb6e20 /src
parent635beba2a236dd3028c4ae20e321b183009ae7a9 (diff)
parent2f132101fbc1b9f988e1cd3baf79408d54a69a14 (diff)
downloadQt-93e3962f3e9536d941314c02f623083f78190123.zip
Qt-93e3962f3e9536d941314c02f623083f78190123.tar.gz
Qt-93e3962f3e9536d941314c02f623083f78190123.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;