Skip to content

Commit fe17e7c

Browse files
committed
Update to qt 5.12
1 parent 183ae32 commit fe17e7c

File tree

455 files changed

+27936
-10952
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

455 files changed

+27936
-10952
lines changed

qtandroidextras/qandroidjnienvironment.go

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,26 @@ func (this *QAndroidJniEnvironment) Operator_minus_greater() unsafe.Pointer /*66
143143
return unsafe.Pointer(uintptr(rv))
144144
}
145145

146+
// /usr/include/qt/QtAndroidExtras/qandroidjnienvironment.h:60
147+
// index:0
148+
// Public Visibility=Default Availability=Available
149+
// [8] jclass findClass(const char *)
150+
151+
/*
152+
Searches for className using all available class loaders. Qt on Android uses a custom class loader to load all the .jar files and it must be used to find any classes that are created by that class loader because these classes are not visible in the default class loader.
153+
154+
Returns the class pointer or null if is not found.
155+
156+
This function was introduced in Qt 5.12.
157+
*/
158+
func (this *QAndroidJniEnvironment) FindClass(className string) unsafe.Pointer /*666*/ {
159+
var convArg0 = qtrt.CString(className)
160+
defer qtrt.FreeMem(convArg0)
161+
rv, err := qtrt.InvokeQtFunc6("_ZN22QAndroidJniEnvironment9findClassEPKc", qtrt.FFI_TYPE_POINTER, this.GetCthis(), convArg0)
162+
qtrt.ErrPrint(err, rv)
163+
return unsafe.Pointer(uintptr(rv))
164+
}
165+
146166
// body block end
147167

148168
// keep block begin

qtandroidextras/qandroidjniexceptioncleaner.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package qtandroidextras
1818

1919
/*
2020
#include <stdlib.h>
21-
// extern C begin: 4
21+
// extern C begin: 5
2222
*/
2323
// import "C"
2424
import "unsafe"
@@ -67,7 +67,7 @@ func (*QAndroidJniExceptionCleaner) NewFromPointer(cthis unsafe.Pointer) *QAndro
6767
return NewQAndroidJniExceptionCleanerFromPointer(cthis)
6868
}
6969

70-
// /usr/include/qt/QtAndroidExtras/qandroidjnienvironment.h:75
70+
// /usr/include/qt/QtAndroidExtras/qandroidjnienvironment.h:76
7171
// index:0
7272
// Public Visibility=Default Availability=Available
7373
// [-2] void QAndroidJniExceptionCleaner(QAndroidJniExceptionCleaner::OutputMode)
@@ -86,7 +86,7 @@ func NewQAndroidJniExceptionCleaner(outputMode int) *QAndroidJniExceptionCleaner
8686
return gothis
8787
}
8888

89-
// /usr/include/qt/QtAndroidExtras/qandroidjnienvironment.h:75
89+
// /usr/include/qt/QtAndroidExtras/qandroidjnienvironment.h:76
9090
// index:0
9191
// Public Visibility=Default Availability=Available
9292
// [-2] void QAndroidJniExceptionCleaner(QAndroidJniExceptionCleaner::OutputMode)
@@ -107,7 +107,7 @@ func NewQAndroidJniExceptionCleanerp() *QAndroidJniExceptionCleaner {
107107
return gothis
108108
}
109109

110-
// /usr/include/qt/QtAndroidExtras/qandroidjnienvironment.h:76
110+
// /usr/include/qt/QtAndroidExtras/qandroidjnienvironment.h:77
111111
// index:0
112112
// Public Visibility=Default Availability=Available
113113
// [-2] void ~QAndroidJniExceptionCleaner()
@@ -122,7 +122,7 @@ func DeleteQAndroidJniExceptionCleaner(this *QAndroidJniExceptionCleaner) {
122122
this.SetCthis(nil)
123123
}
124124

125-
// /usr/include/qt/QtAndroidExtras/qandroidjnienvironment.h:78
125+
// /usr/include/qt/QtAndroidExtras/qandroidjnienvironment.h:79
126126
// index:0
127127
// Public Visibility=Default Availability=Available
128128
// [-2] void clean()

qtandroidextras/qandroidservice.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,15 @@ func (*QAndroidService) NewFromPointer(cthis unsafe.Pointer) *QAndroidService {
6363
return NewQAndroidServiceFromPointer(cthis)
6464
}
6565

66-
// /usr/include/qt/QtAndroidExtras/qandroidservice.h:54
66+
// /usr/include/qt/QtAndroidExtras/qandroidservice.h:55
6767
// index:0
6868
// Public Visibility=Default Availability=Available
6969
// [-2] void QAndroidService(int &, char **, int)
7070

7171
/*
72-
Default constructs an instance of QAndroidService.
72+
Creates a new Android service, passing argc and argv as parameters.
73+
74+
See also QCoreApplication.
7375
*/
7476
func (*QAndroidService) NewForInherit(argc int, argv []string, flags int) *QAndroidService {
7577
return NewQAndroidService(argc, argv, flags)
@@ -83,13 +85,15 @@ func NewQAndroidService(argc int, argv []string, flags int) *QAndroidService {
8385
return gothis
8486
}
8587

86-
// /usr/include/qt/QtAndroidExtras/qandroidservice.h:54
88+
// /usr/include/qt/QtAndroidExtras/qandroidservice.h:55
8789
// index:0
8890
// Public Visibility=Default Availability=Available
8991
// [-2] void QAndroidService(int &, char **, int)
9092

9193
/*
92-
Default constructs an instance of QAndroidService.
94+
Creates a new Android service, passing argc and argv as parameters.
95+
96+
See also QCoreApplication.
9397
*/
9498
func (*QAndroidService) NewForInheritp(argc int, argv []string) *QAndroidService {
9599
return NewQAndroidServicep(argc, argv)
@@ -105,7 +109,7 @@ func NewQAndroidServicep(argc int, argv []string) *QAndroidService {
105109
return gothis
106110
}
107111

108-
// /usr/include/qt/QtAndroidExtras/qandroidservice.h:59
112+
// /usr/include/qt/QtAndroidExtras/qandroidservice.h:66
109113
// index:0
110114
// Public virtual Visibility=Default Availability=Available
111115
// [-2] void ~QAndroidService()
@@ -120,7 +124,7 @@ func DeleteQAndroidService(this *QAndroidService) {
120124
this.SetCthis(nil)
121125
}
122126

123-
// /usr/include/qt/QtAndroidExtras/qandroidservice.h:61
127+
// /usr/include/qt/QtAndroidExtras/qandroidservice.h:68
124128
// index:0
125129
// Public virtual Visibility=Default Availability=Available
126130
// [8] QAndroidBinder * onBind(const QAndroidIntent &)

0 commit comments

Comments
 (0)