From dc1712d4b24bcc32109033412793dfe39438c845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Str=C3=B8mme?= Date: Mon, 10 Aug 2015 22:45:04 +0200 Subject: Remove obsolete check in QMediaService The macro QT_NO_MEMBER_TEMPLATES was removed eons ago. Change-Id: Ifc4f3ac8bcf1e9b42fad5dcfb101e3446a254abc Reviewed-by: Yoann Lopes --- src/multimedia/qmediaservice.h | 2 -- 1 file changed, 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 inline T requestControl() { if (QMediaControl *control = requestControl(qmediacontrol_iid())) { if (T typedControl = qobject_cast(control)) @@ -62,7 +61,6 @@ public: } return 0; } -#endif virtual void releaseControl(QMediaControl *control) = 0; -- cgit v1.2.1