summaryrefslogtreecommitdiffstats
path: root/src/multimedia/qmediaservice.h
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@theqtcompany.com>2015-08-10 22:45:04 +0200
committerChristian Stromme <christian.stromme@theqtcompany.com>2015-08-12 11:34:44 +0000
commitdc1712d4b24bcc32109033412793dfe39438c845 (patch)
tree2a4b053c8e28103a0552257a4d73024b344adc28 /src/multimedia/qmediaservice.h
parentb05e9d99c2e6e27049361a3c0f59ef9c8e57ea99 (diff)
Remove obsolete check in QMediaService
The macro QT_NO_MEMBER_TEMPLATES was removed eons ago. Change-Id: Ifc4f3ac8bcf1e9b42fad5dcfb101e3446a254abc Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'src/multimedia/qmediaservice.h')
-rw-r--r--src/multimedia/qmediaservice.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/multimedia/qmediaservice.h b/src/multimedia/qmediaservice.h
index a2d33ecf5..d95fee8b1 100644
--- a/src/multimedia/qmediaservice.h
+++ b/src/multimedia/qmediaservice.h
@@ -53,7 +53,6 @@ public:
virtual QMediaControl* requestControl(const char *name) = 0;
-#ifndef QT_NO_MEMBER_TEMPLATES
template <typename T> inline T requestControl() {
if (QMediaControl *control = requestControl(qmediacontrol_iid<T>())) {
if (T typedControl = qobject_cast<T>(control))
@@ -62,7 +61,6 @@ public:
}
return 0;
}
-#endif
virtual void releaseControl(QMediaControl *control) = 0;