diff options
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/audio/qsoundeffect_pulse_p.h | 7 | ||||
| -rw-r--r-- | src/multimedia/qmediaopenglhelper_p.h | 2 | ||||
| -rw-r--r-- | src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h | 2 |
3 files changed, 1 insertions, 10 deletions
diff --git a/src/multimedia/audio/qsoundeffect_pulse_p.h b/src/multimedia/audio/qsoundeffect_pulse_p.h index 9275d97ea..9846caee7 100644 --- a/src/multimedia/audio/qsoundeffect_pulse_p.h +++ b/src/multimedia/audio/qsoundeffect_pulse_p.h @@ -163,13 +163,6 @@ private: int m_position; QSoundEffectRef *m_ref; - enum ResourceStatus { - NoResources, - WaitingResources, - GrantedResources, - DeniedResources - }; - ResourceStatus m_resourceStatus; bool m_resourcesAvailable; QMediaPlayerResourceSetInterface *m_resources; diff --git a/src/multimedia/qmediaopenglhelper_p.h b/src/multimedia/qmediaopenglhelper_p.h index 0dbd79d47..bb445b693 100644 --- a/src/multimedia/qmediaopenglhelper_p.h +++ b/src/multimedia/qmediaopenglhelper_p.h @@ -47,7 +47,7 @@ #include <QtGui/QOpenGLContext> -#if defined(Q_OS_WIN) && (defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC)) +#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) && (defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC)) #include <EGL/egl.h> #endif diff --git a/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h b/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h index c064f8ed8..8be77ff07 100644 --- a/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h +++ b/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h @@ -43,8 +43,6 @@ QT_BEGIN_NAMESPACE -const QLatin1String QSGVideoNodeFactoryPluginKey("sgvideonodes"); - class Q_MULTIMEDIAQUICK_EXPORT QSGVideoNode : public QSGGeometryNode { public: |