diff options
| author | Yoann Lopes <yoann.lopes@digia.com> | 2014-09-01 14:19:53 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-09-01 14:19:53 +0200 |
| commit | bc1fa076c944c6af3250cb7210190da42a4de6ea (patch) | |
| tree | b6948fa95abbdd4ffbb30b76c7d3c09ae07e51db /src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h | |
| parent | 0c3438c9a12fbc607eada8f938cf0ad8fdea374d (diff) | |
| parent | 659f238bbbe040cce1bdf900f8f5500845ca8727 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4v5.4.0-alpha1
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; |