fixed compilation of QZXingLive for platforms other than Android

ftylitak · Mar 16, 2017 · f581e87 · f581e87
1 parent a69cd45
commit f581e87
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,4 @@ debug/
 .gradle
 .idea
 .build
+.obj
diff --git a/examples/QZXingLive/QZXingLive.pro b/examples/QZXingLive/QZXingLive.pro
@@ -12,10 +12,12 @@ CONFIG(debug, debug|release) {
 }
 
 HEADERS += \
-    application.h
+    application.h \
+    native.h
 
 SOURCES += main.cpp \
-    application.cpp
+    application.cpp \
+    native.cpp
 
 RESOURCES += qml.qrc
 
@@ -30,12 +32,6 @@ include(deployment.pri)
 android {
     QT += androidextras
 
-    HEADERS += \
-        native.h
-
-    SOURCES +=  \
-        native.cpp
-
     DISTFILES += \
         android/AndroidManifest.xml \
         android/gradle/wrapper/gradle-wrapper.jar \

diff --git a/examples/QZXingLive/native.cpp b/examples/QZXingLive/native.cpp
@@ -1,9 +1,13 @@
-#include <jni.h>
+#if defined(Q_OS_ANDROID)
+    #include <jni.h>
+#endif //Q_OS_ANDROID
 #include "native.h"
 #include <QMetaObject>
 
 QObject *NativeHelpers::application_p_ = 0;
 
+#if defined(Q_OS_ANDROID)
+
 // define our native static functions
 // these are the functions that Java part will call directly from Android UI thread
 static void onPermissionsGranted(JNIEnv * /*env*/, jobject /*obj*/)
@@ -45,3 +49,5 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* /*reserved*/)
 
     return JNI_VERSION_1_6;
 }
+
+#endif // Q_OS_ANDROID
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,3 +25,4 @@ debug/ @@
     .gradle
     .idea
     .build
+    .obj