Merge branch 'dev' into qt_migration

client/platforms/android/native.cpp

@@ -1,54 +0,0 @@
-#include "native.h"
-#include <QMetaObject>
-#if defined(Q_OS_ANDROID)
-    #include <jni.h>
-#endif // Q_OS_ANDROID
-
-
-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*/)
-{
-    QMetaObject::invokeMethod(NativeHelpers::getApplicationInstance(), "onPermissionsGranted"
-                              , Qt::QueuedConnection);
-}
-
-static void onPermissionsDenied(JNIEnv * /*env*/, jobject /*obj*/)
-{
-    QMetaObject::invokeMethod(NativeHelpers::getApplicationInstance(), "onPermissionsDenied"
-                              , Qt::QueuedConnection);
-}
-
-//create a vector with all our JNINativeMethod(s)
-static JNINativeMethod methods[] = {
-    {"onPermissionsGranted", "()V", (void *)onPermissionsGranted},
-    {"onPermissionsDenied", "()V", (void *)onPermissionsDenied},
-};
-
-// this method is called automatically by Java after the .so file is loaded
-JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* /*reserved*/)
-{
-    JNIEnv* env;
-    // get the JNIEnv pointer.
-    if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK)
-      return JNI_ERR;
-
-    // search for Java class which declares the native methods
-    jclass javaClass = env->FindClass("org/ftylitak/qzxing/NativeFunctions");
-    if (!javaClass)
-      return JNI_ERR;
-
-    // register our native methods
-    if (env->RegisterNatives(javaClass, methods,
-                          sizeof(methods) / sizeof(methods[0])) < 0) {
-      return JNI_ERR;
-    }
-
-    return JNI_VERSION_1_6;
-}
-
-#endif // Q_OS_ANDROID

client/platforms/android/native.h

@@ -1,20 +0,0 @@
-#ifndef NATIVE_H
-#define NATIVE_H
-
-#include <QObject>
-
-class NativeHelpers {
-public:
-    static void registerApplicationInstance(QObject *app_p) {
-        application_p_ = app_p;
-    }
-
-    static QObject* getApplicationInstance() {
-        return application_p_;
-    }
-
-private:
-    static QObject *application_p_;
-};
-
-#endif // NATIVE_H

client/platforms/ios/MobileUtils.cpp

@@ -1,5 +1,5 @@
 #include "MobileUtils.h"
 
-void MobileUtils::shareText(const QStringList& filesToSend) {
+void MobileUtils::shareText(const QStringList&) {}
+
 
-}

client/platforms/ios/MobileUtils.h

@@ -12,6 +12,7 @@ public:
 
 public slots:
     static void shareText(const QStringList& filesToSend);
+
 };
 
 #endif // MOBILEUTILS_H

client/platforms/ios/MobileUtils.mm

@@ -1,6 +1,9 @@
 #include "MobileUtils.h"
 
 #include <UIKit/UIKit.h>
+#include <Security/Security.h>
+
+#include <QDebug>
 
 static UIViewController* getViewController() {
     NSArray *windows = [[UIApplication sharedApplication]windows];
@@ -31,3 +34,4 @@ void MobileUtils::shareText(const QStringList& filesToSend) {
         popController.sourceView = qtController.view;
     }
 }
+