slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed build problems with Quicktime

Browse Source 
Because the Q_WS_* defines were removed, the Quicktime backend
stopped working. Replacing them with Q_OS_* works. Additionally,
the Quicktimer Player Service has to depend on QtWidgets.

Change-Id: I687b352191c38a91edaaf2a687ac13ed118fcf88
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
This commit is contained in:
Jonas Rabbe
2011-10-20 12:45:28 +10:00
committed by Qt by Nokia
parent 6466ec1bf3
commit 9deb0512a6
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/plugins.pro
View File

@@ -36,7 +36,7 @@ unix:!mac {
mac:!simulator { mac:!simulator {
SUBDIRS += audiocapture SUBDIRS += audiocapture
!qpa: SUBDIRS += qt7 SUBDIRS += qt7
} }
# fake radio to test the radio APIs # fake radio to test the radio APIs

2
src/plugins/qt7/mediaplayer/qt7playerservice.mm
View File

@@ -41,7 +41,7 @@
#include <QtCore/qvariant.h> #include <QtCore/qvariant.h>
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <QtGui/qwidget.h> #include <QtWidgets/qwidget.h>
#include "qt7backend.h" #include "qt7backend.h"
#include "qt7playerservice.h" #include "qt7playerservice.h"

2
src/plugins/qt7/qt7.pro
View File

@@ -1,7 +1,7 @@
load(qt_module) load(qt_module)
TARGET = qqt7engine TARGET = qqt7engine
QT += multimedia-private multimediawidgets-private network QT += multimedia-private multimediawidgets-private network widgets
PLUGIN_TYPE = mediaservice PLUGIN_TYPE = mediaservice
load(qt_plugin) load(qt_plugin)

4
src/plugins/qt7/qt7backend.h
View File

@@ -46,8 +46,8 @@
#include <QtCore/QString> #include <QtCore/QString>
#ifndef Q_WS_SIMULATOR #ifndef Q_OS_SIMULATOR
#ifndef Q_WS_MAC64 #ifndef Q_OS_MAC64
#define QUICKTIME_C_API_AVAILABLE #define QUICKTIME_C_API_AVAILABLE
#endif #endif
#endif // !defined(Q_WS_SIMULATOR) #endif // !defined(Q_WS_SIMULATOR)