diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 16:25:20 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-01 12:52:51 +0200 |
| commit | 659f238bbbe040cce1bdf900f8f5500845ca8727 (patch) | |
| tree | 7990072bf39b2c19df68bcd7615242d08eb8dd2f /src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h | |
| parent | 80ba1d635dc37963b4c90d776c46774b0349c4f8 (diff) | |
| parent | 1dba07b602ef8b3fd9333a8afb1db4cbaf9d824e (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/gsttools/qgstreamervideoinputdevicecontrol.cpp
src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp
Change-Id: Ic854589562d2deeaa0ebf75840cb8a2ee32e99de
Diffstat (limited to 'src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h')
| -rw-r--r-- | src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h b/src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h index 1cf0bcc91..c1633580f 100644 --- a/src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h +++ b/src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h @@ -35,7 +35,6 @@ #define ANDROIDMEDIAMETADATARETRIEVER_H #include <QtCore/private/qjni_p.h> -#include <qurl.h> QT_BEGIN_NAMESPACE @@ -73,8 +72,7 @@ public: QString extractMetadata(MetadataKey key); void release(); - bool setDataSource(const QUrl &url); - bool setDataSource(const QString &path); + bool setDataSource(const QString &url); private: QJNIObjectPrivate m_metadataRetriever; |