Skip to content

Commit

Permalink
more fixes for 5.11.1 + split js image again + fix sailfish image
Browse files Browse the repository at this point in the history
  • Loading branch information
@therecipe
therecipe committed Jun 26, 2018
1 parent a7a1b3f commit 5355937
Show file tree
Hide file tree
Showing 186 changed files with 612,261 additions and 30,751 deletions.
40 changes: 20 additions & 20 deletions androidextras/androidextras.go
View file
Expand Up @@ -112,30 +112,30 @@ const (
QAndroidBinder__OneWay QAndroidBinder__CallType = QAndroidBinder__CallType(1)
)

func (ptr *QAndroidBinder) ConnectDestroyQAndroidBinder(f func()) {
func NewQAndroidBinder() *QAndroidBinder {

return nil
}

func (ptr *QAndroidBinder) DisconnectDestroyQAndroidBinder() {
func NewQAndroidBinder2(binder QAndroidJniObject_ITF) *QAndroidBinder {

return nil
}

func (ptr *QAndroidBinder) DestroyQAndroidBinder() {
func (ptr *QAndroidBinder) ConnectDestroyQAndroidBinder(f func()) {

}

func (ptr *QAndroidBinder) DestroyQAndroidBinderDefault() {
func (ptr *QAndroidBinder) DisconnectDestroyQAndroidBinder() {

}

func NewQAndroidBinder() *QAndroidBinder {
func (ptr *QAndroidBinder) DestroyQAndroidBinder() {

return nil
}

func NewQAndroidBinder2(binder QAndroidJniObject_ITF) *QAndroidBinder {
func (ptr *QAndroidBinder) DestroyQAndroidBinderDefault() {

return nil
}

func (ptr *QAndroidBinder) Handle() *QAndroidJniObject {
Expand Down Expand Up @@ -281,17 +281,17 @@ func NewQAndroidJniEnvironmentFromPointer(ptr unsafe.Pointer) (n *QAndroidJniEnv
n.SetPointer(ptr)
return
}
func QAndroidJniEnvironment_JavaVM() unsafe.Pointer {
func NewQAndroidJniEnvironment() *QAndroidJniEnvironment {

return nil
}

func (ptr *QAndroidJniEnvironment) JavaVM() unsafe.Pointer {
func QAndroidJniEnvironment_JavaVM() unsafe.Pointer {

return nil
}

func NewQAndroidJniEnvironment() *QAndroidJniEnvironment {
func (ptr *QAndroidJniEnvironment) JavaVM() unsafe.Pointer {

return nil
}
Expand Down Expand Up @@ -628,17 +628,17 @@ func NewQAndroidJniObject3(className string, signature string, v ...interface{})
return nil
}

func NewQAndroidJniObject4(clazz unsafe.Pointer) *QAndroidJniObject {
func NewQAndroidJniObject6(object unsafe.Pointer) *QAndroidJniObject {

return nil
}

func NewQAndroidJniObject5(clazz unsafe.Pointer, signature string, v ...interface{}) *QAndroidJniObject {
func NewQAndroidJniObject4(clazz unsafe.Pointer) *QAndroidJniObject {

return nil
}

func NewQAndroidJniObject6(object unsafe.Pointer) *QAndroidJniObject {
func NewQAndroidJniObject5(clazz unsafe.Pointer, signature string, v ...interface{}) *QAndroidJniObject {

return nil
}
Expand Down Expand Up @@ -987,31 +987,31 @@ func (ptr *QAndroidJniObject) CallMethodVoidCaught(methodName string) error {
return nil
}

func (ptr *QAndroidJniObject) CallMethodInt2(methodName string, signature string, v ...interface{}) int {
func (ptr *QAndroidJniObject) CallMethodInt2(methodName string, sig string, v ...interface{}) int {

return 0
}

func (ptr *QAndroidJniObject) CallMethodInt2Caught(methodName string, signature string, v ...interface{}) (int, error) {
func (ptr *QAndroidJniObject) CallMethodInt2Caught(methodName string, sig string, v ...interface{}) (int, error) {

return 0, nil
}

func (ptr *QAndroidJniObject) CallMethodBoolean2(methodName string, signature string, v ...interface{}) bool {
func (ptr *QAndroidJniObject) CallMethodBoolean2(methodName string, sig string, v ...interface{}) bool {

return false
}

func (ptr *QAndroidJniObject) CallMethodBoolean2Caught(methodName string, signature string, v ...interface{}) (bool, error) {
func (ptr *QAndroidJniObject) CallMethodBoolean2Caught(methodName string, sig string, v ...interface{}) (bool, error) {

return false, nil
}

func (ptr *QAndroidJniObject) CallMethodVoid2(methodName string, signature string, v ...interface{}) {
func (ptr *QAndroidJniObject) CallMethodVoid2(methodName string, sig string, v ...interface{}) {

}

func (ptr *QAndroidJniObject) CallMethodVoid2Caught(methodName string, signature string, v ...interface{}) error {
func (ptr *QAndroidJniObject) CallMethodVoid2Caught(methodName string, sig string, v ...interface{}) error {

return nil
}
Expand Down
60 changes: 30 additions & 30 deletions androidextras/androidextras_android.cpp
View file
Expand Up @@ -40,25 +40,25 @@ class MyQAndroidBinder: public QAndroidBinder
~MyQAndroidBinder() { callbackQAndroidBinder_DestroyQAndroidBinder(this); };
};

void QAndroidBinder_DestroyQAndroidBinder(void* ptr)
void* QAndroidBinder_NewQAndroidBinder()
{
static_cast<QAndroidBinder*>(ptr)->~QAndroidBinder();
return new MyQAndroidBinder();
}

void QAndroidBinder_DestroyQAndroidBinderDefault(void* ptr)
void* QAndroidBinder_NewQAndroidBinder2(void* binder)
{
Q_UNUSED(ptr);

return new MyQAndroidBinder(*static_cast<QAndroidJniObject*>(binder));
}

void* QAndroidBinder_NewQAndroidBinder()
void QAndroidBinder_DestroyQAndroidBinder(void* ptr)
{
return new MyQAndroidBinder();
static_cast<QAndroidBinder*>(ptr)->~QAndroidBinder();
}

void* QAndroidBinder_NewQAndroidBinder2(void* binder)
void QAndroidBinder_DestroyQAndroidBinderDefault(void* ptr)
{
return new MyQAndroidBinder(*static_cast<QAndroidJniObject*>(binder));
Q_UNUSED(ptr);

}

void* QAndroidBinder_Handle(void* ptr)
Expand Down Expand Up @@ -137,14 +137,14 @@ void* QAndroidIntent_Handle(void* ptr)
return new QAndroidJniObject(static_cast<QAndroidIntent*>(ptr)->handle().object());
}

void* QAndroidJniEnvironment_QAndroidJniEnvironment_JavaVM()
void* QAndroidJniEnvironment_NewQAndroidJniEnvironment()
{
return QAndroidJniEnvironment::javaVM();
return new QAndroidJniEnvironment();
}

void* QAndroidJniEnvironment_NewQAndroidJniEnvironment()
void* QAndroidJniEnvironment_QAndroidJniEnvironment_JavaVM()
{
return new QAndroidJniEnvironment();
return QAndroidJniEnvironment::javaVM();
}

void QAndroidJniEnvironment_DestroyQAndroidJniEnvironment(void* ptr)
Expand Down Expand Up @@ -372,6 +372,11 @@ void* QAndroidJniObject_NewQAndroidJniObject3(char* className, char* signature,
return new QAndroidJniObject(const_cast<const char*>(className), const_cast<const char*>(signature), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
}

void* QAndroidJniObject_NewQAndroidJniObject6(void* object)
{
return new QAndroidJniObject(static_cast<jobject>(object));
}

void* QAndroidJniObject_NewQAndroidJniObject4(void* clazz)
{
return new QAndroidJniObject(static_cast<jclass>(clazz));
Expand All @@ -382,11 +387,6 @@ void* QAndroidJniObject_NewQAndroidJniObject5(void* clazz, char* signature, void
return new QAndroidJniObject(static_cast<jclass>(clazz), const_cast<const char*>(signature), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
}

void* QAndroidJniObject_NewQAndroidJniObject6(void* object)
{
return new QAndroidJniObject(static_cast<jobject>(object));
}

int QAndroidJniObject_QAndroidJniObject_CallStaticMethodInt(char* className, char* methodName)
{
return QAndroidJniObject::callStaticMethod<jint>(const_cast<const char*>(className), const_cast<const char*>(methodName));
Expand Down Expand Up @@ -732,34 +732,34 @@ void QAndroidJniObject_CallMethodVoidCaught(void* ptr, char* methodName)
static_cast<QAndroidJniObject*>(ptr)->callMethod<void>(const_cast<const char*>(methodName));
}

int QAndroidJniObject_CallMethodInt2(void* ptr, char* methodName, char* signature, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v)
int QAndroidJniObject_CallMethodInt2(void* ptr, char* methodName, char* sig, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v)
{
return static_cast<QAndroidJniObject*>(ptr)->callMethod<jint>(const_cast<const char*>(methodName), const_cast<const char*>(signature), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
return static_cast<QAndroidJniObject*>(ptr)->callMethod<jint>(const_cast<const char*>(methodName), const_cast<const char*>(sig), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
}

int QAndroidJniObject_CallMethodInt2Caught(void* ptr, char* methodName, char* signature, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v)
int QAndroidJniObject_CallMethodInt2Caught(void* ptr, char* methodName, char* sig, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v)
{
return static_cast<QAndroidJniObject*>(ptr)->callMethod<jint>(const_cast<const char*>(methodName), const_cast<const char*>(signature), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
return static_cast<QAndroidJniObject*>(ptr)->callMethod<jint>(const_cast<const char*>(methodName), const_cast<const char*>(sig), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
}

char QAndroidJniObject_CallMethodBoolean2(void* ptr, char* methodName, char* signature, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v)
char QAndroidJniObject_CallMethodBoolean2(void* ptr, char* methodName, char* sig, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v)
{
return static_cast<QAndroidJniObject*>(ptr)->callMethod<jboolean>(const_cast<const char*>(methodName), const_cast<const char*>(signature), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
return static_cast<QAndroidJniObject*>(ptr)->callMethod<jboolean>(const_cast<const char*>(methodName), const_cast<const char*>(sig), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
}

char QAndroidJniObject_CallMethodBoolean2Caught(void* ptr, char* methodName, char* signature, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v)
char QAndroidJniObject_CallMethodBoolean2Caught(void* ptr, char* methodName, char* sig, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v)
{
return static_cast<QAndroidJniObject*>(ptr)->callMethod<jboolean>(const_cast<const char*>(methodName), const_cast<const char*>(signature), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
return static_cast<QAndroidJniObject*>(ptr)->callMethod<jboolean>(const_cast<const char*>(methodName), const_cast<const char*>(sig), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
}

void QAndroidJniObject_CallMethodVoid2(void* ptr, char* methodName, char* signature, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v)
void QAndroidJniObject_CallMethodVoid2(void* ptr, char* methodName, char* sig, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v)
{
static_cast<QAndroidJniObject*>(ptr)->callMethod<void>(const_cast<const char*>(methodName), const_cast<const char*>(signature), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
static_cast<QAndroidJniObject*>(ptr)->callMethod<void>(const_cast<const char*>(methodName), const_cast<const char*>(sig), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
}

void QAndroidJniObject_CallMethodVoid2Caught(void* ptr, char* methodName, char* signature, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v)
void QAndroidJniObject_CallMethodVoid2Caught(void* ptr, char* methodName, char* sig, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v)
{
static_cast<QAndroidJniObject*>(ptr)->callMethod<void>(const_cast<const char*>(methodName), const_cast<const char*>(signature), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
static_cast<QAndroidJniObject*>(ptr)->callMethod<void>(const_cast<const char*>(methodName), const_cast<const char*>(sig), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
}

int QAndroidJniObject_GetFieldInt(void* ptr, char* fieldName)
Expand Down

0 comments on commit 5355937

Please sign in to comment.