diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-02-17 02:41:11 (GMT) |
|---|---|---|
| committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-02-17 02:49:42 (GMT) |
| commit | a2aaed149cffdde161fc1fc7d718b3fd7f6c96c5 (patch) | |
| tree | 34f2c866f13ff902971537c8bc477ca50d827d45 /src/multimedia/playback/qmediaplayer.h | |
| parent | 4cbeafe5be5f7d20525518fa9c9686fd68869171 (diff) | |
| download | Qt-a2aaed149cffdde161fc1fc7d718b3fd7f6c96c5.zip Qt-a2aaed149cffdde161fc1fc7d718b3fd7f6c96c5.tar.gz Qt-a2aaed149cffdde161fc1fc7d718b3fd7f6c96c5.tar.bz2 | |
Fix QMediaPlayer test failure.
Prepending the Qt namespace with QT_PREPEND_NAMESPACE in a
Q_DECLARE_METATYPE statement is unecessary and appears not to work with
signal declarations in QSignalSpy.
Diffstat (limited to 'src/multimedia/playback/qmediaplayer.h')
| -rw-r--r-- | src/multimedia/playback/qmediaplayer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index dc9d4f0..91d6790 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -193,9 +193,9 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMediaPlayer::State)) -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMediaPlayer::MediaStatus)) -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMediaPlayer::Error)) +Q_DECLARE_METATYPE(QMediaPlayer::State) +Q_DECLARE_METATYPE(QMediaPlayer::MediaStatus) +Q_DECLARE_METATYPE(QMediaPlayer::Error) QT_END_HEADER |