summaryrefslogtreecommitdiffstats
path: root/src/multimedia/qml/qsoundeffect_qmedia_p.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-02-20 10:31:39 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-02-20 10:31:39 (GMT)
commit871e5b4205f08849d089454721c4e27b6b53b51e (patch)
tree616a106ccc5423b60d65759be0d199c89229f7d9 /src/multimedia/qml/qsoundeffect_qmedia_p.h
parent4b82d6f99f7c231cbba1dd5e09ecb09d2218c8bc (diff)
downloadQt-871e5b4205f08849d089454721c4e27b6b53b51e.zip
Qt-871e5b4205f08849d089454721c4e27b6b53b51e.tar.gz
Qt-871e5b4205f08849d089454721c4e27b6b53b51e.tar.bz2
Fix compilation on HP-UXi: m_volume is a #define
Diffstat (limited to 'src/multimedia/qml/qsoundeffect_qmedia_p.h')
-rw-r--r--src/multimedia/qml/qsoundeffect_qmedia_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/qml/qsoundeffect_qmedia_p.h b/src/multimedia/qml/qsoundeffect_qmedia_p.h
index e17d720..8267f79 100644
--- a/src/multimedia/qml/qsoundeffect_qmedia_p.h
+++ b/src/multimedia/qml/qsoundeffect_qmedia_p.h
@@ -98,7 +98,7 @@ Q_SIGNALS:
private:
bool m_muted;
- int m_volume;
+ int m_vol;
QMediaPlayer *m_player;
};