diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 13:22:16 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 13:24:12 +0100 |
| commit | ec316b3b7973efa3f2d2af211b95bc8b45b42a50 (patch) | |
| tree | b3f0445661ccddb4d11a6a90cf944400205edfd8 /src/plugins/qt7 | |
| parent | c2736c3a629d944818c44db9ad69beffb872bdd5 (diff) | |
| parent | 6902c5d770bfa79522d4349215c0b582642c7594 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
sync.profile
Change-Id: I450b86e3d01498aca12fe11a28527a296f2cbc3f
Diffstat (limited to 'src/plugins/qt7')
| -rw-r--r-- | src/plugins/qt7/qt7.pro | 1 | ||||
| -rw-r--r-- | src/plugins/qt7/qt7movierenderer.mm | 2 | ||||
| -rw-r--r-- | src/plugins/qt7/qt7movieviewoutput.mm | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/qt7/qt7.pro b/src/plugins/qt7/qt7.pro index edc3ddde6..ae87bd44a 100644 --- a/src/plugins/qt7/qt7.pro +++ b/src/plugins/qt7/qt7.pro @@ -8,6 +8,7 @@ QT += multimedia-private network } PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = QT7ServicePlugin load(qt_plugin) !simulator { diff --git a/src/plugins/qt7/qt7movierenderer.mm b/src/plugins/qt7/qt7movierenderer.mm index f1508294a..a55c44b18 100644 --- a/src/plugins/qt7/qt7movierenderer.mm +++ b/src/plugins/qt7/qt7movierenderer.mm @@ -55,7 +55,7 @@ #include <qabstractvideosurface.h> #include <qvideosurfaceformat.h> -#include <QtOpenGl/QGLContext> +#include <QtOpenGL/QGLContext> QT_USE_NAMESPACE diff --git a/src/plugins/qt7/qt7movieviewoutput.mm b/src/plugins/qt7/qt7movieviewoutput.mm index 9600872b3..a65fd24ef 100644 --- a/src/plugins/qt7/qt7movieviewoutput.mm +++ b/src/plugins/qt7/qt7movieviewoutput.mm @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#import <QTKit/QTkit.h> +#import <QTKit/QTKit.h> #include "qt7backend.h" |