diff options
| author | Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> | 2016-03-18 14:07:42 +0100 |
|---|---|---|
| committer | aavit <eirik.aavitsland@theqtcompany.com> | 2016-04-12 12:15:46 +0000 |
| commit | 7f286e0965eb31f29c68b1c1e32d2653ae34014e (patch) | |
| tree | baf4c87faf193466f5fa90ed1a4fab92da1d9bea | |
| parent | d32aff3e0453475c1a22d5e8c7a106df18c0ad10 (diff) | |
Remove the traces of the discontinued android-no-sdk platformv5.7.0-beta1
Change-Id: Ib9ba913543270e25e9c8deff492b98b0525c9219
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| -rw-r--r-- | src/plugins/android/android.pro | 2 | ||||
| -rw-r--r-- | src/plugins/android/src/qandroidmediaserviceplugin.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/opensles/qopenslesengine.cpp | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/android/android.pro b/src/plugins/android/android.pro index fa322942b..e77053b77 100644 --- a/src/plugins/android/android.pro +++ b/src/plugins/android/android.pro @@ -1,7 +1,7 @@ TEMPLATE = subdirs SUBDIRS += src -android:!android-no-sdk: SUBDIRS += jar +android: SUBDIRS += jar qtHaveModule(quick) { SUBDIRS += videonode diff --git a/src/plugins/android/src/qandroidmediaserviceplugin.cpp b/src/plugins/android/src/qandroidmediaserviceplugin.cpp index 693789054..87de7d561 100644 --- a/src/plugins/android/src/qandroidmediaserviceplugin.cpp +++ b/src/plugins/android/src/qandroidmediaserviceplugin.cpp @@ -148,7 +148,6 @@ int QAndroidMediaServicePlugin::cameraOrientation(const QByteArray &device) cons QT_END_NAMESPACE -#ifndef Q_OS_ANDROID_NO_SDK Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/) { QT_USE_NAMESPACE @@ -176,4 +175,3 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/) return JNI_VERSION_1_4; } -#endif // Q_OS_ANDROID_NO_SDK diff --git a/src/plugins/opensles/qopenslesengine.cpp b/src/plugins/opensles/qopenslesengine.cpp index 8a08c46f3..0cbd10887 100644 --- a/src/plugins/opensles/qopenslesengine.cpp +++ b/src/plugins/opensles/qopenslesengine.cpp @@ -143,7 +143,7 @@ QList<int> QOpenSLESEngine::supportedSampleRates(QAudio::Mode mode) const int QOpenSLESEngine::getOutputValue(QOpenSLESEngine::OutputValue type, int defaultValue) { -#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) +#if defined(Q_OS_ANDROID) static int sampleRate = 0; static int framesPerBuffer = 0; static const int sdkVersion = QtAndroidPrivate::androidSdkVersion(); @@ -204,7 +204,7 @@ int QOpenSLESEngine::getOutputValue(QOpenSLESEngine::OutputValue type, int defau int QOpenSLESEngine::getDefaultBufferSize(const QAudioFormat &format) { -#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) +#if defined(Q_OS_ANDROID) if (!format.isValid()) return 0; @@ -252,7 +252,7 @@ int QOpenSLESEngine::getLowLatencyBufferSize(const QAudioFormat &format) bool QOpenSLESEngine::supportsLowLatency() { -#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) +#if defined(Q_OS_ANDROID) static int isSupported = -1; if (isSupported != -1) |