This code was including the qmacdefines_mac.h header from QtWidgets,
which has recently been removed. Using the header is no longer
necessary.
Note that the qmacdefines_mac.h contained a workaround for some mac
system headers declaring variables named `slots'. Replace that
workaround with the standard no_keywords method.
Change-Id: Icd47a562d64953692e50a9fea8bb4a9c8424375c
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Update headers from before 2011 that were missed in the previous commit.
Change-Id: Ib0fd91a39ffc57117fe01280e34519c3f914fac0
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Since it's not guaranteed that other Qt modules will be built by the
time qmake is run (and config.tests are created) we can't rely on
compilation. Just check the module.pri variable for widgets instead.
Change-Id: I352cf6427b748b89b69ec17588ce0dd83065090f
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
It does use a config test for now, just to make it clearer. The Mac
backend currently requires widgets, but most of the others should work
without it (just not supporting QVideoWidget/WindowControl).
The QVideoDeviceControl interface was modified to remove the QIcon
usage - it was never implemented.
Unfortunately even the QML examples need widgets for the wrapper
application, and will need to be ported to QtGui based wrapper.
Change-Id: I8a55ad5cf09ab51749510bf16f49de0bd3f0bcdb
Reviewed-by: Ling Hu <ling.hu@nokia.com>
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>
Docs still need some fixing, but there are some legitimate usages of
it there.
Change-Id: I94c7b68788ce97829711a4384884d7e52fe84162
Reviewed-on: http://codereview.qt.nokia.com/1736
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
When closing a QT7PlayerSession, it sets the movie to 0. There is no
need to check if a NULL movie supports the core pixel formats, and
that check lead to a segmentation fault with QtSDK 1.1.1.
Task-number: QTMOBILITY-1746
Reviewed-by: Dmytro Poplavskiy
(cherry picked from commit b5d9964aab96ef1a02ca1af411178f05c42c2bf8)
Change-Id: I7cdddbd8fc1b8d8d667747aec3567aeb857accd6
Reviewed-on: http://codereview.qt.nokia.com/984
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard