Merge branch 'master' into v5.12.mrg

drswinghead · drswinghead · commit 5d9eb1d7d804 · 2019-03-22T22:48:31.000+08:00
diff --git a/qtandroidextras/mod_qclass.go b/qtandroidextras/mod_qclass.go
@@ -152,6 +152,8 @@ type JNIEnv struct {
 	cthis unsafe.Pointer
 }
 
+func (this *JNIEnv) GetCthis() unsafe.Pointer { return this.cthis }
+
 func (this *QAndroidJniEnvironment) JNIEnv() *JNIEnv {
 	rv, err := qtrt.InvokeQtFunc6("C_ZNK22QAndroidJniEnvironmentcvP7_JNIEnvEv",
 		qtrt.FFI_TYPE_POINTER, this.GetCthis())

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,8 @@ type JNIEnv struct {`
`152`	`152`	`cthis unsafe.Pointer`
`153`	`153`	`}`
`154`	`154`
	`155`	`+func (this *JNIEnv) GetCthis() unsafe.Pointer { return this.cthis }`
	`156`	`+`
`155`	`157`	`func (this QAndroidJniEnvironment) JNIEnv() JNIEnv {`
`156`	`158`	`rv, err := qtrt.InvokeQtFunc6("C_ZNK22QAndroidJniEnvironmentcvP7_JNIEnvEv",`
`157`	`159`	`qtrt.FFI_TYPE_POINTER, this.GetCthis())`