diff options
Diffstat (limited to 'src/plugins/android')
| -rw-r--r-- | src/plugins/android/android.pro | 2 | ||||
| -rw-r--r-- | src/plugins/android/src/qandroidmediaserviceplugin.cpp | 2 |
2 files changed, 1 insertions, 3 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 |