Fixed build problems with Quicktime

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>

diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 09b9461ea74e1e484dd49070a11c2653e82c7771..ced4db9f07ad5bffb1c616ac29cac65da1e0a020 100644 (file)
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -36,7 +36,7 @@ unix:!mac {
 
 mac:!simulator {
     SUBDIRS += audiocapture
-    !qpa: SUBDIRS += qt7
+    SUBDIRS += qt7
 }
 
 # fake radio to test the radio APIs

diff --git a/src/plugins/qt7/mediaplayer/qt7playerservice.mm b/src/plugins/qt7/mediaplayer/qt7playerservice.mm
index 8dabbdaddb2ed75e88f122159cda5736b61b40c1..f868fd578de98604eb639a8761f77e2c98929b8a 100644 (file)
--- a/src/plugins/qt7/mediaplayer/qt7playerservice.mm
+++ b/src/plugins/qt7/mediaplayer/qt7playerservice.mm
@@ -41,7 +41,7 @@
 
 #include <QtCore/qvariant.h>
 #include <QtCore/qdebug.h>
-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>
 
 #include "qt7backend.h"
 #include "qt7playerservice.h"

diff --git a/src/plugins/qt7/qt7.pro b/src/plugins/qt7/qt7.pro
index 34e54cfc5041c1e6fb781e1b5415e67f3a2374ef..e58b19925b07b3840874841a262eb097a76f648f 100644 (file)
--- a/src/plugins/qt7/qt7.pro
+++ b/src/plugins/qt7/qt7.pro
@@ -1,7 +1,7 @@
 load(qt_module)
 
 TARGET = qqt7engine
-QT += multimedia-private multimediawidgets-private network
+QT += multimedia-private multimediawidgets-private network widgets
 PLUGIN_TYPE = mediaservice
 
 load(qt_plugin)

diff --git a/src/plugins/qt7/qt7backend.h b/src/plugins/qt7/qt7backend.h
index 67ff53abbf5a0fb5fc8256c14c96edbdcd8937a1..92c56edd7f4652b501666a98b493b8aa791b05b8 100644 (file)
--- a/src/plugins/qt7/qt7backend.h
+++ b/src/plugins/qt7/qt7backend.h
@@ -46,8 +46,8 @@
 
 #include <QtCore/QString>
 
-#ifndef Q_WS_SIMULATOR
-#ifndef Q_WS_MAC64
+#ifndef Q_OS_SIMULATOR
+#ifndef Q_OS_MAC64
 #define QUICKTIME_C_API_AVAILABLE
 #endif
 #endif // !defined(Q_WS_SIMULATOR)