diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-04-30 05:32:43 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-04-30 05:32:43 (GMT) |
| commit | 85db980578cb9f1b95be160a4386d9822c6ec6d0 (patch) | |
| tree | 94db73d854dd559a355207f21aa49c903bcce28a /src/imports | |
| parent | 77cddec6ea642b073d1d9c017c865e740c0c60bc (diff) | |
| download | Qt-85db980578cb9f1b95be160a4386d9822c6ec6d0.zip Qt-85db980578cb9f1b95be160a4386d9822c6ec6d0.tar.gz Qt-85db980578cb9f1b95be160a4386d9822c6ec6d0.tar.bz2 | |
Make QDeclarativeParserStatus method pure virtual to encourage right code.
Fix all code to be right, except multimedia. Currently, it's not *required*
that types work without componentComplete, so not vital.
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/multimedia/qdeclarativeaudio.cpp | 7 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativeaudio_p.h | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp index 896f9b7..3c35bc1 100644 --- a/src/imports/multimedia/qdeclarativeaudio.cpp +++ b/src/imports/multimedia/qdeclarativeaudio.cpp @@ -316,9 +316,14 @@ QDeclarativeAudio::Error QDeclarativeAudio::error() const return Error(m_error); } +void QDeclarativeAudio::classBegin() +{ +} + void QDeclarativeAudio::componentComplete() { - setObject(this); + if (m_playerControl == 0) + setObject(this); } diff --git a/src/imports/multimedia/qdeclarativeaudio_p.h b/src/imports/multimedia/qdeclarativeaudio_p.h index 24276ea..e960b9d 100644 --- a/src/imports/multimedia/qdeclarativeaudio_p.h +++ b/src/imports/multimedia/qdeclarativeaudio_p.h @@ -115,6 +115,7 @@ public: Status status() const; Error error() const; + void classBegin(); void componentComplete(); public Q_SLOTS: |