diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-11-01 11:46:11 +1000 |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-11-01 11:46:11 +1000 |
| commit | 5e2fa76d8ea74e7a230bd970e17f4579185d0465 (patch) | |
| tree | 516d1af2a73ca69704df0c6161e6eae8430eba07 /plugins/declarative/multimedia/qdeclarativevideo_p.h | |
| parent | ceae9bf04430ce1d885a9c696b25d50f36fc0623 (diff) | |
| parent | 9dc22d8cd28fc793c411b1fcb98a06f7c99906f5 (diff) | |
Merge branch 'master' of ../qtmobility into master-from-1.1
Conflicts:
plugins/declarative/multimedia/qdeclarativemediabase.cpp
plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.cpp
src/multimedia/effects/qsoundeffect.cpp
src/multimedia/effects/qsoundeffect_p.h
src/multimedia/effects/qsoundeffect_pulse_p.cpp
src/multimedia/effects/qsoundeffect_pulse_p.h
src/multimedia/effects/qsoundeffect_qmedia_p.cpp
src/multimedia/effects/qsoundeffect_qmedia_p.h
src/multimedia/effects/qsoundeffect_qsound_p.cpp
src/multimedia/effects/qsoundeffect_qsound_p.h
src/s60installs/bwins/QtMultimediaKitu.def
src/s60installs/eabi/QtMultimediaKitu.def
tests/auto/qsoundeffect/tst_qsoundeffect.cpp
Diffstat (limited to 'plugins/declarative/multimedia/qdeclarativevideo_p.h')
| -rw-r--r-- | plugins/declarative/multimedia/qdeclarativevideo_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/declarative/multimedia/qdeclarativevideo_p.h b/plugins/declarative/multimedia/qdeclarativevideo_p.h index f6ef7d81e4..115ef9d105 100644 --- a/plugins/declarative/multimedia/qdeclarativevideo_p.h +++ b/plugins/declarative/multimedia/qdeclarativevideo_p.h @@ -151,7 +151,7 @@ Q_SIGNALS: void autoLoadChanged(); void playingChanged(); void pausedChanged(); - void loopsChanged(); + void loopCountChanged(); void started(); void resumed(); |