Fixed qtmultimedia imports -qtnamespace issues.

Change-Id: Ie7896faf92b3cc5fdf2b6dbe885913c2669e6e36
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Toby Tomkins
2011-11-21 17:37:31 +10:00
committed by Qt by Nokia
parent f2237b2e66
commit cc61a0a8c7
4 changed files with 12 additions and 0 deletions

View File

@@ -216,3 +216,5 @@ void QDeclarativeRadio::_q_error(QRadioTuner::Error errorCode)
emit error(static_cast<QDeclarativeRadio::Error>(errorCode)); emit error(static_cast<QDeclarativeRadio::Error>(errorCode));
emit errorChanged(); emit errorChanged();
} }
QT_END_NAMESPACE

View File

@@ -116,3 +116,5 @@ void QDeclarativeRadioData::_q_error(QRadioData::Error errorCode)
emit error(static_cast<QDeclarativeRadioData::Error>(errorCode)); emit error(static_cast<QDeclarativeRadioData::Error>(errorCode));
emit errorChanged(); emit errorChanged();
} }
QT_END_NAMESPACE

View File

@@ -57,6 +57,8 @@
//#define DEBUG_VIDEOITEM //#define DEBUG_VIDEOITEM
Q_DECLARE_METATYPE(QAbstractVideoSurface*) Q_DECLARE_METATYPE(QAbstractVideoSurface*)
QT_BEGIN_NAMESPACE
class QSGVideoItemSurface : public QAbstractVideoSurface class QSGVideoItemSurface : public QAbstractVideoSurface
{ {
public: public:
@@ -382,3 +384,5 @@ QSGNode *QDeclarativeVideoOutput::updatePaintNode(QSGNode *oldNode, UpdatePaintN
videoNode->setCurrentFrame(m_frame); videoNode->setCurrentFrame(m_frame);
return videoNode; return videoNode;
} }
QT_END_NAMESPACE

View File

@@ -51,6 +51,8 @@
#include "qsgvideonode_p.h" #include "qsgvideonode_p.h"
QT_BEGIN_NAMESPACE
class QSGVideoItemSurface; class QSGVideoItemSurface;
class QVideoRendererControl; class QVideoRendererControl;
class QMediaService; class QMediaService;
@@ -120,4 +122,6 @@ private:
QRectF m_sourceRect; QRectF m_sourceRect;
}; };
QT_END_NAMESPACE
#endif // QDECLARATIVEVIDEOOUTPUT_H #endif // QDECLARATIVEVIDEOOUTPUT_H