summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-11-25 20:12:05 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-11-26 20:55:49 (GMT)
commit2dea30e2b044f3f02727e28ca4ff73036406870b (patch)
tree56bcfb35efaae59ba3e6f973cad8f5ed6858e600
parent0f49bba82a62546bb53d0a29a05a560fe8f1e293 (diff)
downloadQt-2dea30e2b044f3f02727e28ca4ff73036406870b.zip
Qt-2dea30e2b044f3f02727e28ca4ff73036406870b.tar.gz
Qt-2dea30e2b044f3f02727e28ca4ff73036406870b.tar.bz2
Phonon: Fix warning on casting from "false" to QFlags.
Instead, return Features();
-rw-r--r--src/3rdparty/phonon/phonon/mediacontroller.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/phonon/mediacontroller.cpp b/src/3rdparty/phonon/phonon/mediacontroller.cpp
index 59fd5c7..37af3f7 100644
--- a/src/3rdparty/phonon/phonon/mediacontroller.cpp
+++ b/src/3rdparty/phonon/phonon/mediacontroller.cpp
@@ -76,9 +76,9 @@ MediaController::~MediaController()
MediaController::Features MediaController::supportedFeatures() const
{
if (!d || !d->media) {
- return false;
+ return Features();
}
- IFACE false;
+ IFACE Features();
Features ret;
if (iface->hasInterface(AddonInterface::AngleInterface)) {
ret |= Angles;