fix wrong iOS sysroot linking issue + revert minor change from de3f785

This commit is contained in:
therecipe 2018-11-17 17:42:12 +01:00
parent de3f785199
commit 4cdafbc0fd
13 changed files with 174 additions and 144 deletions

View file

@ -140,7 +140,6 @@ func CleanName(name, value string) string {
"unsafe",
"log",
"runtime",
"errors",
"time",
"hex":
{

View file

@ -507,13 +507,13 @@ func bundle(mode, target, path, name, depPath string, tagsCustom string, fast bo
utils.Save(filepath.Join(depPath, "c_main_wrapper_"+t+".cpp"), ios_c_main_wrapper())
rcc.ResourceNames = make(map[string]string)
cmd := exec.Command("xcrun", "clang++", "c_main_wrapper_"+t+".cpp", target+"_plugin_import.cpp")
newArgs := templater.GetiOSClang(target, t, depPath)
if utils.ExistsFile(filepath.Join(depPath, target+"_qml_plugin_import.cpp")) {
cmd.Args = append(cmd.Args, target+"_qml_plugin_import.cpp")
}
cmd.Args = append(cmd.Args, "-o", "build/main", "-u", "_qt_registerPlatformPlugin", "-Wl,-e,_qt_main_wrapper", "-I../..", "-L.", "-lgo")
cmd.Dir = depPath
cmd.Args = append(cmd.Args, templater.GetiOSClang(target, t, depPath)...)
cmd.Args = append(cmd.Args, newArgs...)
utils.RunCmd(cmd, fmt.Sprintf("compile wrapper for %v (%v) on %v", target, t, runtime.GOOS))
strip := exec.Command("strip", "main")
@ -632,10 +632,12 @@ func bundle(mode, target, path, name, depPath string, tagsCustom string, fast bo
utils.Save(filepath.Join(depPath, "c_main_wrapper_js.cpp"), js_c_main_wrapper(target))
env, _, _, _ := cmd.BuildEnv(target, "", "")
cmd := exec.Command(filepath.Join(env["EMSCRIPTEN"], "em++"), "c_main_wrapper_js.cpp", target+".js_plugin_import.cpp")
newArgs := templater.GetiOSClang(target, "", depPath)
if utils.ExistsFile(filepath.Join(depPath, target+".js_qml_plugin_import.cpp")) {
cmd.Args = append(cmd.Args, target+".js_qml_plugin_import.cpp")
}
cmd.Dir = depPath
cmd.Args = append(cmd.Args, newArgs...)
for rccFile := range rcc.ResourceNames {
cmd.Args = append(cmd.Args, rccFile)
@ -691,7 +693,6 @@ func bundle(mode, target, path, name, depPath string, tagsCustom string, fast bo
//TODO: check if minimal packages are stale and skip main.js rebuild this if they aren't
cmd.Args = append(cmd.Args, []string{"-o", "main.js"}...)
cmd.Args = append(cmd.Args, templater.GetiOSClang(target, "", depPath)...)
for key, value := range env {
cmd.Env = append(cmd.Env, fmt.Sprintf("%v=%v", key, value))

View file

@ -32,7 +32,7 @@ func run(target, name, depPath, device string) {
time.Sleep(1 * time.Second)
utils.RunCmdOptional(exec.Command("xcrun", "simctl", "uninstall", "booted", filepath.Join(depPath, "main.app")), "uninstall old app")
utils.RunCmdOptional(exec.Command("xcrun", "simctl", "install", "booted", filepath.Join(depPath, "main.app")), "install new app")
utils.RunCmdOptional(exec.Command("xcrun", "simctl", "launch", "booted", fmt.Sprintf("com.yourcompany.%v", name)), "start app") //TODO: parse ident from plist
utils.RunCmdOptional(exec.Command("xcrun", "simctl", "launch", "booted", strings.Replace(name, "_", "", -1)), "start app") //TODO: parse ident from plist
case "darwin":
exec.Command("open", filepath.Join(depPath, fmt.Sprintf("%v.app", name))).Start()

View file

@ -16,48 +16,78 @@ func XCODE_DIR() string {
return filepath.Join("/Applications/Xcode.app")
}
var _MACOS_SDK_DIR string
func MACOS_SDK_DIR() string {
if _MACOS_SDK_DIR != "" {
return _MACOS_SDK_DIR
}
if runtime.GOOS == "darwin" {
basePath := filepath.Join(XCODE_DIR(), "Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs")
for _, i := range []string{"15", "14", "13", "12", "11", "10"} {
if ExistsDir(filepath.Join(basePath, fmt.Sprintf("MacOSX10.%v.sdk", i))) {
return fmt.Sprintf("MacOSX10.%v.sdk", i)
for maj := 10; maj < 50; maj++ {
for min := 0; min < 25; min++ {
i := fmt.Sprintf("%v.%v", maj, min)
if ExistsDir(filepath.Join(basePath, fmt.Sprintf("MacOSX%v.sdk", i))) {
_MACOS_SDK_DIR = fmt.Sprintf("MacOSX%v.sdk", i)
return _MACOS_SDK_DIR
}
}
}
if ExistsDir(filepath.Join(basePath, "MacOSX.sdk")) {
return "MacOSX.sdk"
_MACOS_SDK_DIR = "MacOSX.sdk"
return _MACOS_SDK_DIR
}
Log.Errorf("failed to find MacOSX sdk in %v", basePath)
}
return ""
}
var _IPHONEOS_SDK_DIR string
func IPHONEOS_SDK_DIR() string {
if _IPHONEOS_SDK_DIR != "" {
return _IPHONEOS_SDK_DIR
}
if runtime.GOOS == "darwin" {
basePath := filepath.Join(XCODE_DIR(), "Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs")
for _, i := range []string{"13.0", "12.0", "11.0", "10.1", "10.0", "9.3", "9.2", "9.1", "9.0"} {
if ExistsDir(filepath.Join(basePath, fmt.Sprintf("iPhoneOS%v.sdk", i))) {
return fmt.Sprintf("iPhoneOS%v.sdk", i)
for maj := 10; maj < 50; maj++ {
for min := 0; min < 25; min++ {
i := fmt.Sprintf("%v.%v", maj, min)
if ExistsDir(filepath.Join(basePath, fmt.Sprintf("iPhoneOS%v.sdk", i))) {
_IPHONEOS_SDK_DIR = fmt.Sprintf("iPhoneOS%v.sdk", i)
return _IPHONEOS_SDK_DIR
}
}
}
if ExistsDir(filepath.Join(basePath, "iPhoneOS.sdk")) {
return "iPhoneOS.sdk"
_IPHONEOS_SDK_DIR = "iPhoneOS.sdk"
return _IPHONEOS_SDK_DIR
}
Log.Errorf("failed to find iPhoneOS sdk in %v", basePath)
}
return ""
}
var _IPHONESIMULATOR_SDK_DIR string
func IPHONESIMULATOR_SDK_DIR() string {
if _IPHONESIMULATOR_SDK_DIR != "" {
return _IPHONESIMULATOR_SDK_DIR
}
if runtime.GOOS == "darwin" {
basePath := filepath.Join(XCODE_DIR(), "Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs")
for _, i := range []string{"13.0", "12.0", "11.0", "10.1", "10.0", "9.3", "9.2", "9.1", "9.0"} {
if ExistsDir(filepath.Join(basePath, fmt.Sprintf("iPhoneSimulator%v.sdk", i))) {
return fmt.Sprintf("iPhoneSimulator%v.sdk", i)
for maj := 10; maj < 50; maj++ {
for min := 0; min < 25; min++ {
i := fmt.Sprintf("%v.%v", maj, min)
if ExistsDir(filepath.Join(basePath, fmt.Sprintf("iPhoneSimulator%v.sdk", i))) {
_IPHONESIMULATOR_SDK_DIR = fmt.Sprintf("iPhoneSimulator%v.sdk", i)
return _IPHONESIMULATOR_SDK_DIR
}
}
}
if ExistsDir(filepath.Join(basePath, "iPhoneSimulator.sdk")) {
return "iPhoneSimulator.sdk"
_IPHONESIMULATOR_SDK_DIR = "iPhoneSimulator.sdk"
return _IPHONESIMULATOR_SDK_DIR
}
Log.Errorf("failed to find iPhoneSimulator sdk in %v", basePath)
}

View file

@ -3604,7 +3604,7 @@ public:
void Signal_NetworkAccessibleChanged(QNetworkAccessManager::NetworkAccessibility accessible) { callbackQNetworkAccessManager_NetworkAccessibleChanged(this, accessible); };
void Signal_PreSharedKeyAuthenticationRequired(QNetworkReply * reply, QSslPreSharedKeyAuthenticator * authenticator) { callbackQNetworkAccessManager_PreSharedKeyAuthenticationRequired(this, reply, authenticator); };
void Signal_ProxyAuthenticationRequired(const QNetworkProxy & proxy, QAuthenticator * authenticator) { callbackQNetworkAccessManager_ProxyAuthenticationRequired(this, const_cast<QNetworkProxy*>(&proxy), authenticator); };
void Signal_SslErrors(QNetworkReply * reply, const QList<QSslError> & erro) { callbackQNetworkAccessManager_SslErrors(this, reply, ({ QList<QSslError>* tmpValue = const_cast<QList<QSslError>*>(&erro); QtNetwork_PackedList { tmpValue, tmpValue->size() }; })); };
void Signal_SslErrors(QNetworkReply * reply, const QList<QSslError> & errors) { callbackQNetworkAccessManager_SslErrors(this, reply, ({ QList<QSslError>* tmpValue = const_cast<QList<QSslError>*>(&errors); QtNetwork_PackedList { tmpValue, tmpValue->size() }; })); };
~MyQNetworkAccessManager() { callbackQNetworkAccessManager_DestroyQNetworkAccessManager(this); };
QStringList supportedSchemesImplementation() const { return ({ QtNetwork_PackedString tempVal = callbackQNetworkAccessManager_SupportedSchemesImplementation(const_cast<void*>(static_cast<const void*>(this))); QStringList ret = QString::fromUtf8(tempVal.data, tempVal.len).split("|", QString::SkipEmptyParts); free(tempVal.data); ret; }); };
const QMetaObject * metaObject() const { return static_cast<QMetaObject*>(callbackQNetworkAccessManager_MetaObject(const_cast<void*>(static_cast<const void*>(this)))); };
@ -3914,9 +3914,9 @@ void QNetworkAccessManager_DisconnectSslErrors(void* ptr)
QObject::disconnect(static_cast<QNetworkAccessManager*>(ptr), static_cast<void (QNetworkAccessManager::*)(QNetworkReply *, const QList<QSslError> &)>(&QNetworkAccessManager::sslErrors), static_cast<MyQNetworkAccessManager*>(ptr), static_cast<void (MyQNetworkAccessManager::*)(QNetworkReply *, const QList<QSslError> &)>(&MyQNetworkAccessManager::Signal_SslErrors));
}
void QNetworkAccessManager_SslErrors(void* ptr, void* reply, void* erro)
void QNetworkAccessManager_SslErrors(void* ptr, void* reply, void* errors)
{
static_cast<QNetworkAccessManager*>(ptr)->sslErrors(static_cast<QNetworkReply*>(reply), *static_cast<QList<QSslError>*>(erro));
static_cast<QNetworkAccessManager*>(ptr)->sslErrors(static_cast<QNetworkReply*>(reply), *static_cast<QList<QSslError>*>(errors));
}
void QNetworkAccessManager_DestroyQNetworkAccessManager(void* ptr)
@ -6066,14 +6066,14 @@ public:
void Signal_Error2(QNetworkReply::NetworkError code) { callbackQNetworkReply_Error2(this, code); };
void Signal_Finished() { callbackQNetworkReply_Finished(this); };
void ignoreSslErrors() { callbackQNetworkReply_IgnoreSslErrors(this); };
void ignoreSslErrorsImplementation(const QList<QSslError> & erro) { callbackQNetworkReply_IgnoreSslErrorsImplementation(this, ({ QList<QSslError>* tmpValue = const_cast<QList<QSslError>*>(&erro); QtNetwork_PackedList { tmpValue, tmpValue->size() }; })); };
void ignoreSslErrorsImplementation(const QList<QSslError> & errors) { callbackQNetworkReply_IgnoreSslErrorsImplementation(this, ({ QList<QSslError>* tmpValue = const_cast<QList<QSslError>*>(&errors); QtNetwork_PackedList { tmpValue, tmpValue->size() }; })); };
void Signal_MetaDataChanged() { callbackQNetworkReply_MetaDataChanged(this); };
void Signal_PreSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator * authenticator) { callbackQNetworkReply_PreSharedKeyAuthenticationRequired(this, authenticator); };
void Signal_RedirectAllowed() { callbackQNetworkReply_RedirectAllowed(this); };
void Signal_Redirected(const QUrl & url) { callbackQNetworkReply_Redirected(this, const_cast<QUrl*>(&url)); };
void setReadBufferSize(qint64 size) { callbackQNetworkReply_SetReadBufferSize(this, size); };
void setSslConfigurationImplementation(const QSslConfiguration & configuration) { callbackQNetworkReply_SetSslConfigurationImplementation(this, const_cast<QSslConfiguration*>(&configuration)); };
void Signal_SslErrors(const QList<QSslError> & erro) { callbackQNetworkReply_SslErrors(this, ({ QList<QSslError>* tmpValue = const_cast<QList<QSslError>*>(&erro); QtNetwork_PackedList { tmpValue, tmpValue->size() }; })); };
void Signal_SslErrors(const QList<QSslError> & errors) { callbackQNetworkReply_SslErrors(this, ({ QList<QSslError>* tmpValue = const_cast<QList<QSslError>*>(&errors); QtNetwork_PackedList { tmpValue, tmpValue->size() }; })); };
void Signal_UploadProgress(qint64 bytesSent, qint64 bytesTotal) { callbackQNetworkReply_UploadProgress(this, bytesSent, bytesTotal); };
~MyQNetworkReply() { callbackQNetworkReply_DestroyQNetworkReply(this); };
const QMetaObject * metaObject() const { return static_cast<QMetaObject*>(callbackQNetworkReply_MetaObject(const_cast<void*>(static_cast<const void*>(this)))); };
@ -6245,19 +6245,19 @@ void QNetworkReply_IgnoreSslErrorsDefault(void* ptr)
static_cast<QNetworkReply*>(ptr)->QNetworkReply::ignoreSslErrors();
}
void QNetworkReply_IgnoreSslErrors2(void* ptr, void* erro)
void QNetworkReply_IgnoreSslErrors2(void* ptr, void* errors)
{
static_cast<QNetworkReply*>(ptr)->ignoreSslErrors(*static_cast<QList<QSslError>*>(erro));
static_cast<QNetworkReply*>(ptr)->ignoreSslErrors(*static_cast<QList<QSslError>*>(errors));
}
void QNetworkReply_IgnoreSslErrorsImplementation(void* ptr, void* erro)
void QNetworkReply_IgnoreSslErrorsImplementation(void* ptr, void* errors)
{
static_cast<QNetworkReply*>(ptr)->ignoreSslErrorsImplementation(*static_cast<QList<QSslError>*>(erro));
static_cast<QNetworkReply*>(ptr)->ignoreSslErrorsImplementation(*static_cast<QList<QSslError>*>(errors));
}
void QNetworkReply_IgnoreSslErrorsImplementationDefault(void* ptr, void* erro)
void QNetworkReply_IgnoreSslErrorsImplementationDefault(void* ptr, void* errors)
{
static_cast<QNetworkReply*>(ptr)->QNetworkReply::ignoreSslErrorsImplementation(*static_cast<QList<QSslError>*>(erro));
static_cast<QNetworkReply*>(ptr)->QNetworkReply::ignoreSslErrorsImplementation(*static_cast<QList<QSslError>*>(errors));
}
void QNetworkReply_ConnectMetaDataChanged(void* ptr)
@ -6395,9 +6395,9 @@ void QNetworkReply_DisconnectSslErrors(void* ptr)
QObject::disconnect(static_cast<QNetworkReply*>(ptr), static_cast<void (QNetworkReply::*)(const QList<QSslError> &)>(&QNetworkReply::sslErrors), static_cast<MyQNetworkReply*>(ptr), static_cast<void (MyQNetworkReply::*)(const QList<QSslError> &)>(&MyQNetworkReply::Signal_SslErrors));
}
void QNetworkReply_SslErrors(void* ptr, void* erro)
void QNetworkReply_SslErrors(void* ptr, void* errors)
{
static_cast<QNetworkReply*>(ptr)->sslErrors(*static_cast<QList<QSslError>*>(erro));
static_cast<QNetworkReply*>(ptr)->sslErrors(*static_cast<QList<QSslError>*>(errors));
}
void QNetworkReply_ConnectUploadProgress(void* ptr)
@ -8643,7 +8643,7 @@ public:
void resume() { callbackQAbstractSocket_Resume(this); };
void setReadBufferSize(qint64 size) { callbackQAbstractSocket_SetReadBufferSize(this, size); };
void setSocketOption(QAbstractSocket::SocketOption option, const QVariant & value) { callbackQAbstractSocket_SetSocketOption(this, option, const_cast<QVariant*>(&value)); };
void Signal_SslErrors2(const QList<QSslError> & erro) { callbackQSslSocket_SslErrors2(this, ({ QList<QSslError>* tmpValue = const_cast<QList<QSslError>*>(&erro); QtNetwork_PackedList { tmpValue, tmpValue->size() }; })); };
void Signal_SslErrors2(const QList<QSslError> & errors) { callbackQSslSocket_SslErrors2(this, ({ QList<QSslError>* tmpValue = const_cast<QList<QSslError>*>(&errors); QtNetwork_PackedList { tmpValue, tmpValue->size() }; })); };
void startClientEncryption() { callbackQSslSocket_StartClientEncryption(this); };
void startServerEncryption() { callbackQSslSocket_StartServerEncryption(this); };
~MyQSslSocket() { callbackQSslSocket_DestroyQSslSocket(this); };
@ -8839,9 +8839,9 @@ void QSslSocket_IgnoreSslErrorsDefault(void* ptr)
static_cast<QSslSocket*>(ptr)->QSslSocket::ignoreSslErrors();
}
void QSslSocket_IgnoreSslErrors2(void* ptr, void* erro)
void QSslSocket_IgnoreSslErrors2(void* ptr, void* errors)
{
static_cast<QSslSocket*>(ptr)->ignoreSslErrors(*static_cast<QList<QSslError>*>(erro));
static_cast<QSslSocket*>(ptr)->ignoreSslErrors(*static_cast<QList<QSslError>*>(errors));
}
void QSslSocket_ConnectModeChanged(void* ptr)
@ -8949,9 +8949,9 @@ void QSslSocket_DisconnectSslErrors2(void* ptr)
QObject::disconnect(static_cast<QSslSocket*>(ptr), static_cast<void (QSslSocket::*)(const QList<QSslError> &)>(&QSslSocket::sslErrors), static_cast<MyQSslSocket*>(ptr), static_cast<void (MyQSslSocket::*)(const QList<QSslError> &)>(&MyQSslSocket::Signal_SslErrors2));
}
void QSslSocket_SslErrors2(void* ptr, void* erro)
void QSslSocket_SslErrors2(void* ptr, void* errors)
{
static_cast<QSslSocket*>(ptr)->sslErrors(*static_cast<QList<QSslError>*>(erro));
static_cast<QSslSocket*>(ptr)->sslErrors(*static_cast<QList<QSslError>*>(errors));
}
void QSslSocket_StartClientEncryption(void* ptr)

View file

@ -7891,21 +7891,21 @@ func (ptr *QNetworkAccessManager) SetStrictTransportSecurityEnabled(enabled bool
}
//export callbackQNetworkAccessManager_SslErrors
func callbackQNetworkAccessManager_SslErrors(ptr unsafe.Pointer, reply unsafe.Pointer, erro C.struct_QtNetwork_PackedList) {
func callbackQNetworkAccessManager_SslErrors(ptr unsafe.Pointer, reply unsafe.Pointer, errors C.struct_QtNetwork_PackedList) {
if signal := qt.GetSignal(ptr, "sslErrors"); signal != nil {
signal.(func(*QNetworkReply, []*QSslError))(NewQNetworkReplyFromPointer(reply), func(l C.struct_QtNetwork_PackedList) []*QSslError {
out := make([]*QSslError, int(l.len))
tmpList := NewQNetworkAccessManagerFromPointer(l.data)
for i := 0; i < len(out); i++ {
out[i] = tmpList.__sslErrors_erro_atList(i)
out[i] = tmpList.__sslErrors_errors_atList(i)
}
return out
}(erro))
}(errors))
}
}
func (ptr *QNetworkAccessManager) ConnectSslErrors(f func(reply *QNetworkReply, erro []*QSslError)) {
func (ptr *QNetworkAccessManager) ConnectSslErrors(f func(reply *QNetworkReply, errors []*QSslError)) {
if ptr.Pointer() != nil {
if !qt.ExistsSignal(ptr.Pointer(), "sslErrors") {
@ -7913,9 +7913,9 @@ func (ptr *QNetworkAccessManager) ConnectSslErrors(f func(reply *QNetworkReply,
}
if signal := qt.LendSignal(ptr.Pointer(), "sslErrors"); signal != nil {
qt.ConnectSignal(ptr.Pointer(), "sslErrors", func(reply *QNetworkReply, erro []*QSslError) {
signal.(func(*QNetworkReply, []*QSslError))(reply, erro)
f(reply, erro)
qt.ConnectSignal(ptr.Pointer(), "sslErrors", func(reply *QNetworkReply, errors []*QSslError) {
signal.(func(*QNetworkReply, []*QSslError))(reply, errors)
f(reply, errors)
})
} else {
qt.ConnectSignal(ptr.Pointer(), "sslErrors", f)
@ -7930,12 +7930,12 @@ func (ptr *QNetworkAccessManager) DisconnectSslErrors() {
}
}
func (ptr *QNetworkAccessManager) SslErrors(reply QNetworkReply_ITF, erro []*QSslError) {
func (ptr *QNetworkAccessManager) SslErrors(reply QNetworkReply_ITF, errors []*QSslError) {
if ptr.Pointer() != nil {
C.QNetworkAccessManager_SslErrors(ptr.Pointer(), PointerFromQNetworkReply(reply), func() unsafe.Pointer {
tmpList := NewQNetworkAccessManagerFromPointer(NewQNetworkAccessManagerFromPointer(nil).__sslErrors_erro_newList())
for _, v := range erro {
tmpList.__sslErrors_erro_setList(v)
tmpList := NewQNetworkAccessManagerFromPointer(NewQNetworkAccessManagerFromPointer(nil).__sslErrors_errors_newList())
for _, v := range errors {
tmpList.__sslErrors_errors_setList(v)
}
return tmpList.Pointer()
}())
@ -13043,12 +13043,12 @@ func (ptr *QNetworkReply) IgnoreSslErrorsDefault() {
}
}
func (ptr *QNetworkReply) IgnoreSslErrors2(erro []*QSslError) {
func (ptr *QNetworkReply) IgnoreSslErrors2(errors []*QSslError) {
if ptr.Pointer() != nil {
C.QNetworkReply_IgnoreSslErrors2(ptr.Pointer(), func() unsafe.Pointer {
tmpList := NewQNetworkReplyFromPointer(NewQNetworkReplyFromPointer(nil).__ignoreSslErrors_erro_newList2())
for _, v := range erro {
tmpList.__ignoreSslErrors_erro_setList2(v)
tmpList := NewQNetworkReplyFromPointer(NewQNetworkReplyFromPointer(nil).__ignoreSslErrors_errors_newList2())
for _, v := range errors {
tmpList.__ignoreSslErrors_errors_setList2(v)
}
return tmpList.Pointer()
}())
@ -13056,35 +13056,35 @@ func (ptr *QNetworkReply) IgnoreSslErrors2(erro []*QSslError) {
}
//export callbackQNetworkReply_IgnoreSslErrorsImplementation
func callbackQNetworkReply_IgnoreSslErrorsImplementation(ptr unsafe.Pointer, erro C.struct_QtNetwork_PackedList) {
func callbackQNetworkReply_IgnoreSslErrorsImplementation(ptr unsafe.Pointer, errors C.struct_QtNetwork_PackedList) {
if signal := qt.GetSignal(ptr, "ignoreSslErrorsImplementation"); signal != nil {
signal.(func([]*QSslError))(func(l C.struct_QtNetwork_PackedList) []*QSslError {
out := make([]*QSslError, int(l.len))
tmpList := NewQNetworkReplyFromPointer(l.data)
for i := 0; i < len(out); i++ {
out[i] = tmpList.__ignoreSslErrorsImplementation_erro_atList(i)
out[i] = tmpList.__ignoreSslErrorsImplementation_errors_atList(i)
}
return out
}(erro))
}(errors))
} else {
NewQNetworkReplyFromPointer(ptr).IgnoreSslErrorsImplementationDefault(func(l C.struct_QtNetwork_PackedList) []*QSslError {
out := make([]*QSslError, int(l.len))
tmpList := NewQNetworkReplyFromPointer(l.data)
for i := 0; i < len(out); i++ {
out[i] = tmpList.__ignoreSslErrorsImplementation_erro_atList(i)
out[i] = tmpList.__ignoreSslErrorsImplementation_errors_atList(i)
}
return out
}(erro))
}(errors))
}
}
func (ptr *QNetworkReply) ConnectIgnoreSslErrorsImplementation(f func(erro []*QSslError)) {
func (ptr *QNetworkReply) ConnectIgnoreSslErrorsImplementation(f func(errors []*QSslError)) {
if ptr.Pointer() != nil {
if signal := qt.LendSignal(ptr.Pointer(), "ignoreSslErrorsImplementation"); signal != nil {
qt.ConnectSignal(ptr.Pointer(), "ignoreSslErrorsImplementation", func(erro []*QSslError) {
signal.(func([]*QSslError))(erro)
f(erro)
qt.ConnectSignal(ptr.Pointer(), "ignoreSslErrorsImplementation", func(errors []*QSslError) {
signal.(func([]*QSslError))(errors)
f(errors)
})
} else {
qt.ConnectSignal(ptr.Pointer(), "ignoreSslErrorsImplementation", f)
@ -13099,24 +13099,24 @@ func (ptr *QNetworkReply) DisconnectIgnoreSslErrorsImplementation() {
}
}
func (ptr *QNetworkReply) IgnoreSslErrorsImplementation(erro []*QSslError) {
func (ptr *QNetworkReply) IgnoreSslErrorsImplementation(errors []*QSslError) {
if ptr.Pointer() != nil {
C.QNetworkReply_IgnoreSslErrorsImplementation(ptr.Pointer(), func() unsafe.Pointer {
tmpList := NewQNetworkReplyFromPointer(NewQNetworkReplyFromPointer(nil).__ignoreSslErrorsImplementation_erro_newList())
for _, v := range erro {
tmpList.__ignoreSslErrorsImplementation_erro_setList(v)
tmpList := NewQNetworkReplyFromPointer(NewQNetworkReplyFromPointer(nil).__ignoreSslErrorsImplementation_errors_newList())
for _, v := range errors {
tmpList.__ignoreSslErrorsImplementation_errors_setList(v)
}
return tmpList.Pointer()
}())
}
}
func (ptr *QNetworkReply) IgnoreSslErrorsImplementationDefault(erro []*QSslError) {
func (ptr *QNetworkReply) IgnoreSslErrorsImplementationDefault(errors []*QSslError) {
if ptr.Pointer() != nil {
C.QNetworkReply_IgnoreSslErrorsImplementationDefault(ptr.Pointer(), func() unsafe.Pointer {
tmpList := NewQNetworkReplyFromPointer(NewQNetworkReplyFromPointer(nil).__ignoreSslErrorsImplementation_erro_newList())
for _, v := range erro {
tmpList.__ignoreSslErrorsImplementation_erro_setList(v)
tmpList := NewQNetworkReplyFromPointer(NewQNetworkReplyFromPointer(nil).__ignoreSslErrorsImplementation_errors_newList())
for _, v := range errors {
tmpList.__ignoreSslErrorsImplementation_errors_setList(v)
}
return tmpList.Pointer()
}())
@ -13423,21 +13423,21 @@ func (ptr *QNetworkReply) SetUrl(url core.QUrl_ITF) {
}
//export callbackQNetworkReply_SslErrors
func callbackQNetworkReply_SslErrors(ptr unsafe.Pointer, erro C.struct_QtNetwork_PackedList) {
func callbackQNetworkReply_SslErrors(ptr unsafe.Pointer, errors C.struct_QtNetwork_PackedList) {
if signal := qt.GetSignal(ptr, "sslErrors"); signal != nil {
signal.(func([]*QSslError))(func(l C.struct_QtNetwork_PackedList) []*QSslError {
out := make([]*QSslError, int(l.len))
tmpList := NewQNetworkReplyFromPointer(l.data)
for i := 0; i < len(out); i++ {
out[i] = tmpList.__sslErrors_erro_atList(i)
out[i] = tmpList.__sslErrors_errors_atList(i)
}
return out
}(erro))
}(errors))
}
}
func (ptr *QNetworkReply) ConnectSslErrors(f func(erro []*QSslError)) {
func (ptr *QNetworkReply) ConnectSslErrors(f func(errors []*QSslError)) {
if ptr.Pointer() != nil {
if !qt.ExistsSignal(ptr.Pointer(), "sslErrors") {
@ -13445,9 +13445,9 @@ func (ptr *QNetworkReply) ConnectSslErrors(f func(erro []*QSslError)) {
}
if signal := qt.LendSignal(ptr.Pointer(), "sslErrors"); signal != nil {
qt.ConnectSignal(ptr.Pointer(), "sslErrors", func(erro []*QSslError) {
signal.(func([]*QSslError))(erro)
f(erro)
qt.ConnectSignal(ptr.Pointer(), "sslErrors", func(errors []*QSslError) {
signal.(func([]*QSslError))(errors)
f(errors)
})
} else {
qt.ConnectSignal(ptr.Pointer(), "sslErrors", f)
@ -13462,12 +13462,12 @@ func (ptr *QNetworkReply) DisconnectSslErrors() {
}
}
func (ptr *QNetworkReply) SslErrors(erro []*QSslError) {
func (ptr *QNetworkReply) SslErrors(errors []*QSslError) {
if ptr.Pointer() != nil {
C.QNetworkReply_SslErrors(ptr.Pointer(), func() unsafe.Pointer {
tmpList := NewQNetworkReplyFromPointer(NewQNetworkReplyFromPointer(nil).__sslErrors_erro_newList())
for _, v := range erro {
tmpList.__sslErrors_erro_setList(v)
tmpList := NewQNetworkReplyFromPointer(NewQNetworkReplyFromPointer(nil).__sslErrors_errors_newList())
for _, v := range errors {
tmpList.__sslErrors_errors_setList(v)
}
return tmpList.Pointer()
}())
@ -18754,12 +18754,12 @@ func (ptr *QSslSocket) IgnoreSslErrorsDefault() {
}
}
func (ptr *QSslSocket) IgnoreSslErrors2(erro []*QSslError) {
func (ptr *QSslSocket) IgnoreSslErrors2(errors []*QSslError) {
if ptr.Pointer() != nil {
C.QSslSocket_IgnoreSslErrors2(ptr.Pointer(), func() unsafe.Pointer {
tmpList := NewQSslSocketFromPointer(NewQSslSocketFromPointer(nil).__ignoreSslErrors_erro_newList2())
for _, v := range erro {
tmpList.__ignoreSslErrors_erro_setList2(v)
tmpList := NewQSslSocketFromPointer(NewQSslSocketFromPointer(nil).__ignoreSslErrors_errors_newList2())
for _, v := range errors {
tmpList.__ignoreSslErrors_errors_setList2(v)
}
return tmpList.Pointer()
}())
@ -18965,21 +18965,21 @@ func (ptr *QSslSocket) SetSslConfiguration(configuration QSslConfiguration_ITF)
}
//export callbackQSslSocket_SslErrors2
func callbackQSslSocket_SslErrors2(ptr unsafe.Pointer, erro C.struct_QtNetwork_PackedList) {
func callbackQSslSocket_SslErrors2(ptr unsafe.Pointer, errors C.struct_QtNetwork_PackedList) {
if signal := qt.GetSignal(ptr, "sslErrors2"); signal != nil {
signal.(func([]*QSslError))(func(l C.struct_QtNetwork_PackedList) []*QSslError {
out := make([]*QSslError, int(l.len))
tmpList := NewQSslSocketFromPointer(l.data)
for i := 0; i < len(out); i++ {
out[i] = tmpList.__sslErrors_erro_atList2(i)
out[i] = tmpList.__sslErrors_errors_atList2(i)
}
return out
}(erro))
}(errors))
}
}
func (ptr *QSslSocket) ConnectSslErrors2(f func(erro []*QSslError)) {
func (ptr *QSslSocket) ConnectSslErrors2(f func(errors []*QSslError)) {
if ptr.Pointer() != nil {
if !qt.ExistsSignal(ptr.Pointer(), "sslErrors2") {
@ -18987,9 +18987,9 @@ func (ptr *QSslSocket) ConnectSslErrors2(f func(erro []*QSslError)) {
}
if signal := qt.LendSignal(ptr.Pointer(), "sslErrors2"); signal != nil {
qt.ConnectSignal(ptr.Pointer(), "sslErrors2", func(erro []*QSslError) {
signal.(func([]*QSslError))(erro)
f(erro)
qt.ConnectSignal(ptr.Pointer(), "sslErrors2", func(errors []*QSslError) {
signal.(func([]*QSslError))(errors)
f(errors)
})
} else {
qt.ConnectSignal(ptr.Pointer(), "sslErrors2", f)
@ -19004,12 +19004,12 @@ func (ptr *QSslSocket) DisconnectSslErrors2() {
}
}
func (ptr *QSslSocket) SslErrors2(erro []*QSslError) {
func (ptr *QSslSocket) SslErrors2(errors []*QSslError) {
if ptr.Pointer() != nil {
C.QSslSocket_SslErrors2(ptr.Pointer(), func() unsafe.Pointer {
tmpList := NewQSslSocketFromPointer(NewQSslSocketFromPointer(nil).__sslErrors_erro_newList2())
for _, v := range erro {
tmpList.__sslErrors_erro_setList2(v)
tmpList := NewQSslSocketFromPointer(NewQSslSocketFromPointer(nil).__sslErrors_errors_newList2())
for _, v := range errors {
tmpList.__sslErrors_errors_setList2(v)
}
return tmpList.Pointer()
}())

View file

@ -607,7 +607,7 @@ void QNetworkAccessManager_SetRedirectPolicy(void* ptr, long long policy);
void QNetworkAccessManager_SetStrictTransportSecurityEnabled(void* ptr, char enabled);
void QNetworkAccessManager_ConnectSslErrors(void* ptr);
void QNetworkAccessManager_DisconnectSslErrors(void* ptr);
void QNetworkAccessManager_SslErrors(void* ptr, void* reply, void* erro);
void QNetworkAccessManager_SslErrors(void* ptr, void* reply, void* errors);
void QNetworkAccessManager_DestroyQNetworkAccessManager(void* ptr);
void QNetworkAccessManager_DestroyQNetworkAccessManagerDefault(void* ptr);
void* QNetworkAccessManager_Cache(void* ptr);
@ -1007,9 +1007,9 @@ void QNetworkReply_DisconnectFinished(void* ptr);
void QNetworkReply_Finished(void* ptr);
void QNetworkReply_IgnoreSslErrors(void* ptr);
void QNetworkReply_IgnoreSslErrorsDefault(void* ptr);
void QNetworkReply_IgnoreSslErrors2(void* ptr, void* erro);
void QNetworkReply_IgnoreSslErrorsImplementation(void* ptr, void* erro);
void QNetworkReply_IgnoreSslErrorsImplementationDefault(void* ptr, void* erro);
void QNetworkReply_IgnoreSslErrors2(void* ptr, void* errors);
void QNetworkReply_IgnoreSslErrorsImplementation(void* ptr, void* errors);
void QNetworkReply_IgnoreSslErrorsImplementationDefault(void* ptr, void* errors);
void QNetworkReply_ConnectMetaDataChanged(void* ptr);
void QNetworkReply_DisconnectMetaDataChanged(void* ptr);
void QNetworkReply_MetaDataChanged(void* ptr);
@ -1037,7 +1037,7 @@ void QNetworkReply_SetSslConfigurationImplementationDefault(void* ptr, void* con
void QNetworkReply_SetUrl(void* ptr, void* url);
void QNetworkReply_ConnectSslErrors(void* ptr);
void QNetworkReply_DisconnectSslErrors(void* ptr);
void QNetworkReply_SslErrors(void* ptr, void* erro);
void QNetworkReply_SslErrors(void* ptr, void* errors);
void QNetworkReply_ConnectUploadProgress(void* ptr);
void QNetworkReply_DisconnectUploadProgress(void* ptr);
void QNetworkReply_UploadProgress(void* ptr, long long bytesSent, long long bytesTotal);
@ -1481,7 +1481,7 @@ void QSslSocket_DisconnectEncryptedBytesWritten(void* ptr);
void QSslSocket_EncryptedBytesWritten(void* ptr, long long written);
void QSslSocket_IgnoreSslErrors(void* ptr);
void QSslSocket_IgnoreSslErrorsDefault(void* ptr);
void QSslSocket_IgnoreSslErrors2(void* ptr, void* erro);
void QSslSocket_IgnoreSslErrors2(void* ptr, void* errors);
void QSslSocket_ConnectModeChanged(void* ptr);
void QSslSocket_DisconnectModeChanged(void* ptr);
void QSslSocket_ModeChanged(void* ptr, long long mode);
@ -1503,7 +1503,7 @@ void QSslSocket_SetProtocol(void* ptr, long long protocol);
void QSslSocket_SetSslConfiguration(void* ptr, void* configuration);
void QSslSocket_ConnectSslErrors2(void* ptr);
void QSslSocket_DisconnectSslErrors2(void* ptr);
void QSslSocket_SslErrors2(void* ptr, void* erro);
void QSslSocket_SslErrors2(void* ptr, void* errors);
void QSslSocket_StartClientEncryption(void* ptr);
void QSslSocket_StartClientEncryptionDefault(void* ptr);
void QSslSocket_StartServerEncryption(void* ptr);

View file

@ -1846,9 +1846,9 @@ long long QQmlEngine_QQmlEngine_ObjectOwnership(void* object)
return QQmlEngine::objectOwnership(static_cast<QObject*>(object));
}
char QQmlEngine_ImportPlugin(void* ptr, struct QtQml_PackedString filePath, struct QtQml_PackedString uri, void* erro)
char QQmlEngine_ImportPlugin(void* ptr, struct QtQml_PackedString filePath, struct QtQml_PackedString uri, void* errors)
{
return static_cast<QQmlEngine*>(ptr)->importPlugin(QString::fromUtf8(filePath.data, filePath.len), QString::fromUtf8(uri.data, uri.len), static_cast<QList<QQmlError>*>(erro));
return static_cast<QQmlEngine*>(ptr)->importPlugin(QString::fromUtf8(filePath.data, filePath.len), QString::fromUtf8(uri.data, uri.len), static_cast<QList<QQmlError>*>(errors));
}
void QQmlEngine_AddImageProvider(void* ptr, struct QtQml_PackedString providerId, void* provider)

View file

@ -3080,7 +3080,7 @@ func (ptr *QQmlEngine) ObjectOwnership(object core.QObject_ITF) QQmlEngine__Obje
return QQmlEngine__ObjectOwnership(C.QQmlEngine_QQmlEngine_ObjectOwnership(core.PointerFromQObject(object)))
}
func (ptr *QQmlEngine) ImportPlugin(filePath string, uri string, erro []*QQmlError) bool {
func (ptr *QQmlEngine) ImportPlugin(filePath string, uri string, errors []*QQmlError) bool {
if ptr.Pointer() != nil {
var filePathC *C.char
if filePath != "" {
@ -3093,9 +3093,9 @@ func (ptr *QQmlEngine) ImportPlugin(filePath string, uri string, erro []*QQmlErr
defer C.free(unsafe.Pointer(uriC))
}
return int8(C.QQmlEngine_ImportPlugin(ptr.Pointer(), C.struct_QtQml_PackedString{data: filePathC, len: C.longlong(len(filePath))}, C.struct_QtQml_PackedString{data: uriC, len: C.longlong(len(uri))}, func() unsafe.Pointer {
tmpList := NewQQmlEngineFromPointer(NewQQmlEngineFromPointer(nil).__importPlugin_erro_newList())
for _, v := range erro {
tmpList.__importPlugin_erro_setList(v)
tmpList := NewQQmlEngineFromPointer(NewQQmlEngineFromPointer(nil).__importPlugin_errors_newList())
for _, v := range errors {
tmpList.__importPlugin_errors_setList(v)
}
return tmpList.Pointer()
}())) != 0

View file

@ -252,7 +252,7 @@ void QQmlContext_TimerEventDefault(void* ptr, void* event);
void* QQmlEngine_QQmlEngine_ContextForObject(void* object);
void* QQmlEngine_NewQQmlEngine(void* parent);
long long QQmlEngine_QQmlEngine_ObjectOwnership(void* object);
char QQmlEngine_ImportPlugin(void* ptr, struct QtQml_PackedString filePath, struct QtQml_PackedString uri, void* erro);
char QQmlEngine_ImportPlugin(void* ptr, struct QtQml_PackedString filePath, struct QtQml_PackedString uri, void* errors);
void QQmlEngine_AddImageProvider(void* ptr, struct QtQml_PackedString providerId, void* provider);
void QQmlEngine_AddImportPath(void* ptr, struct QtQml_PackedString path);
void QQmlEngine_AddPluginPath(void* ptr, struct QtQml_PackedString path);

View file

@ -274,7 +274,7 @@ public:
void Signal_PreSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator * authenticator) { callbackQWebSocket_PreSharedKeyAuthenticationRequired(this, authenticator); };
void Signal_ProxyAuthenticationRequired(const QNetworkProxy & proxy, QAuthenticator * authenticator) { callbackQWebSocket_ProxyAuthenticationRequired(this, const_cast<QNetworkProxy*>(&proxy), authenticator); };
void Signal_ReadChannelFinished() { callbackQWebSocket_ReadChannelFinished(this); };
void Signal_SslErrors(const QList<QSslError> & erro) { callbackQWebSocket_SslErrors(this, ({ QList<QSslError>* tmpValue = const_cast<QList<QSslError>*>(&erro); QtWebSockets_PackedList { tmpValue, tmpValue->size() }; })); };
void Signal_SslErrors(const QList<QSslError> & errors) { callbackQWebSocket_SslErrors(this, ({ QList<QSslError>* tmpValue = const_cast<QList<QSslError>*>(&errors); QtWebSockets_PackedList { tmpValue, tmpValue->size() }; })); };
void Signal_StateChanged(QAbstractSocket::SocketState state) { callbackQWebSocket_StateChanged(this, state); };
void Signal_TextFrameReceived(const QString & frame, bool isLastFrame) { QByteArray t39d88b = frame.toUtf8(); QtWebSockets_PackedString framePacked = { const_cast<char*>(t39d88b.prepend("WHITESPACE").constData()+10), t39d88b.size()-10 };callbackQWebSocket_TextFrameReceived(this, framePacked, isLastFrame); };
void Signal_TextMessageReceived(const QString & message) { QByteArray t6f9b9a = message.toUtf8(); QtWebSockets_PackedString messagePacked = { const_cast<char*>(t6f9b9a.prepend("WHITESPACE").constData()+10), t6f9b9a.size()-10 };callbackQWebSocket_TextMessageReceived(this, messagePacked); };
@ -491,9 +491,9 @@ void QWebSocket_IgnoreSslErrorsDefault(void* ptr)
static_cast<QWebSocket*>(ptr)->QWebSocket::ignoreSslErrors();
}
void QWebSocket_IgnoreSslErrors2(void* ptr, void* erro)
void QWebSocket_IgnoreSslErrors2(void* ptr, void* errors)
{
static_cast<QWebSocket*>(ptr)->ignoreSslErrors(*static_cast<QList<QSslError>*>(erro));
static_cast<QWebSocket*>(ptr)->ignoreSslErrors(*static_cast<QList<QSslError>*>(errors));
}
void QWebSocket_Open2(void* ptr, void* request)
@ -626,9 +626,9 @@ void QWebSocket_DisconnectSslErrors(void* ptr)
QObject::disconnect(static_cast<QWebSocket*>(ptr), static_cast<void (QWebSocket::*)(const QList<QSslError> &)>(&QWebSocket::sslErrors), static_cast<MyQWebSocket*>(ptr), static_cast<void (MyQWebSocket::*)(const QList<QSslError> &)>(&MyQWebSocket::Signal_SslErrors));
}
void QWebSocket_SslErrors(void* ptr, void* erro)
void QWebSocket_SslErrors(void* ptr, void* errors)
{
static_cast<QWebSocket*>(ptr)->sslErrors(*static_cast<QList<QSslError>*>(erro));
static_cast<QWebSocket*>(ptr)->sslErrors(*static_cast<QList<QSslError>*>(errors));
}
void QWebSocket_ConnectStateChanged(void* ptr)
@ -1002,7 +1002,7 @@ public:
void Signal_PeerVerifyError(const QSslError & error) { callbackQWebSocketServer_PeerVerifyError(this, const_cast<QSslError*>(&error)); };
void Signal_PreSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator * authenticator) { callbackQWebSocketServer_PreSharedKeyAuthenticationRequired(this, authenticator); };
void Signal_ServerError(QWebSocketProtocol::CloseCode closeCode) { callbackQWebSocketServer_ServerError(this, closeCode); };
void Signal_SslErrors(const QList<QSslError> & erro) { callbackQWebSocketServer_SslErrors(this, ({ QList<QSslError>* tmpValue = const_cast<QList<QSslError>*>(&erro); QtWebSockets_PackedList { tmpValue, tmpValue->size() }; })); };
void Signal_SslErrors(const QList<QSslError> & errors) { callbackQWebSocketServer_SslErrors(this, ({ QList<QSslError>* tmpValue = const_cast<QList<QSslError>*>(&errors); QtWebSockets_PackedList { tmpValue, tmpValue->size() }; })); };
~MyQWebSocketServer() { callbackQWebSocketServer_DestroyQWebSocketServer(this); };
const QMetaObject * metaObject() const { return static_cast<QMetaObject*>(callbackQWebSocketServer_MetaObject(const_cast<void*>(static_cast<const void*>(this)))); };
bool event(QEvent * e) { return callbackQWebSocketServer_Event(this, e) != 0; };
@ -1241,9 +1241,9 @@ void QWebSocketServer_DisconnectSslErrors(void* ptr)
QObject::disconnect(static_cast<QWebSocketServer*>(ptr), static_cast<void (QWebSocketServer::*)(const QList<QSslError> &)>(&QWebSocketServer::sslErrors), static_cast<MyQWebSocketServer*>(ptr), static_cast<void (MyQWebSocketServer::*)(const QList<QSslError> &)>(&MyQWebSocketServer::Signal_SslErrors));
}
void QWebSocketServer_SslErrors(void* ptr, void* erro)
void QWebSocketServer_SslErrors(void* ptr, void* errors)
{
static_cast<QWebSocketServer*>(ptr)->sslErrors(*static_cast<QList<QSslError>*>(erro));
static_cast<QWebSocketServer*>(ptr)->sslErrors(*static_cast<QList<QSslError>*>(errors));
}
void QWebSocketServer_DestroyQWebSocketServer(void* ptr)

View file

@ -953,12 +953,12 @@ func (ptr *QWebSocket) IgnoreSslErrorsDefault() {
}
}
func (ptr *QWebSocket) IgnoreSslErrors2(erro []*network.QSslError) {
func (ptr *QWebSocket) IgnoreSslErrors2(errors []*network.QSslError) {
if ptr.Pointer() != nil {
C.QWebSocket_IgnoreSslErrors2(ptr.Pointer(), func() unsafe.Pointer {
tmpList := NewQWebSocketFromPointer(NewQWebSocketFromPointer(nil).__ignoreSslErrors_erro_newList2())
for _, v := range erro {
tmpList.__ignoreSslErrors_erro_setList2(v)
tmpList := NewQWebSocketFromPointer(NewQWebSocketFromPointer(nil).__ignoreSslErrors_errors_newList2())
for _, v := range errors {
tmpList.__ignoreSslErrors_errors_setList2(v)
}
return tmpList.Pointer()
}())
@ -1284,21 +1284,21 @@ func (ptr *QWebSocket) SetSslConfiguration(sslConfiguration network.QSslConfigur
}
//export callbackQWebSocket_SslErrors
func callbackQWebSocket_SslErrors(ptr unsafe.Pointer, erro C.struct_QtWebSockets_PackedList) {
func callbackQWebSocket_SslErrors(ptr unsafe.Pointer, errors C.struct_QtWebSockets_PackedList) {
if signal := qt.GetSignal(ptr, "sslErrors"); signal != nil {
signal.(func([]*network.QSslError))(func(l C.struct_QtWebSockets_PackedList) []*network.QSslError {
out := make([]*network.QSslError, int(l.len))
tmpList := NewQWebSocketFromPointer(l.data)
for i := 0; i < len(out); i++ {
out[i] = tmpList.__sslErrors_erro_atList(i)
out[i] = tmpList.__sslErrors_errors_atList(i)
}
return out
}(erro))
}(errors))
}
}
func (ptr *QWebSocket) ConnectSslErrors(f func(erro []*network.QSslError)) {
func (ptr *QWebSocket) ConnectSslErrors(f func(errors []*network.QSslError)) {
if ptr.Pointer() != nil {
if !qt.ExistsSignal(ptr.Pointer(), "sslErrors") {
@ -1306,9 +1306,9 @@ func (ptr *QWebSocket) ConnectSslErrors(f func(erro []*network.QSslError)) {
}
if signal := qt.LendSignal(ptr.Pointer(), "sslErrors"); signal != nil {
qt.ConnectSignal(ptr.Pointer(), "sslErrors", func(erro []*network.QSslError) {
signal.(func([]*network.QSslError))(erro)
f(erro)
qt.ConnectSignal(ptr.Pointer(), "sslErrors", func(errors []*network.QSslError) {
signal.(func([]*network.QSslError))(errors)
f(errors)
})
} else {
qt.ConnectSignal(ptr.Pointer(), "sslErrors", f)
@ -1323,12 +1323,12 @@ func (ptr *QWebSocket) DisconnectSslErrors() {
}
}
func (ptr *QWebSocket) SslErrors(erro []*network.QSslError) {
func (ptr *QWebSocket) SslErrors(errors []*network.QSslError) {
if ptr.Pointer() != nil {
C.QWebSocket_SslErrors(ptr.Pointer(), func() unsafe.Pointer {
tmpList := NewQWebSocketFromPointer(NewQWebSocketFromPointer(nil).__sslErrors_erro_newList())
for _, v := range erro {
tmpList.__sslErrors_erro_setList(v)
tmpList := NewQWebSocketFromPointer(NewQWebSocketFromPointer(nil).__sslErrors_errors_newList())
for _, v := range errors {
tmpList.__sslErrors_errors_setList(v)
}
return tmpList.Pointer()
}())
@ -2648,21 +2648,21 @@ func (ptr *QWebSocketServer) SetSslConfiguration(sslConfiguration network.QSslCo
}
//export callbackQWebSocketServer_SslErrors
func callbackQWebSocketServer_SslErrors(ptr unsafe.Pointer, erro C.struct_QtWebSockets_PackedList) {
func callbackQWebSocketServer_SslErrors(ptr unsafe.Pointer, errors C.struct_QtWebSockets_PackedList) {
if signal := qt.GetSignal(ptr, "sslErrors"); signal != nil {
signal.(func([]*network.QSslError))(func(l C.struct_QtWebSockets_PackedList) []*network.QSslError {
out := make([]*network.QSslError, int(l.len))
tmpList := NewQWebSocketServerFromPointer(l.data)
for i := 0; i < len(out); i++ {
out[i] = tmpList.__sslErrors_erro_atList(i)
out[i] = tmpList.__sslErrors_errors_atList(i)
}
return out
}(erro))
}(errors))
}
}
func (ptr *QWebSocketServer) ConnectSslErrors(f func(erro []*network.QSslError)) {
func (ptr *QWebSocketServer) ConnectSslErrors(f func(errors []*network.QSslError)) {
if ptr.Pointer() != nil {
if !qt.ExistsSignal(ptr.Pointer(), "sslErrors") {
@ -2670,9 +2670,9 @@ func (ptr *QWebSocketServer) ConnectSslErrors(f func(erro []*network.QSslError))
}
if signal := qt.LendSignal(ptr.Pointer(), "sslErrors"); signal != nil {
qt.ConnectSignal(ptr.Pointer(), "sslErrors", func(erro []*network.QSslError) {
signal.(func([]*network.QSslError))(erro)
f(erro)
qt.ConnectSignal(ptr.Pointer(), "sslErrors", func(errors []*network.QSslError) {
signal.(func([]*network.QSslError))(errors)
f(errors)
})
} else {
qt.ConnectSignal(ptr.Pointer(), "sslErrors", f)
@ -2687,12 +2687,12 @@ func (ptr *QWebSocketServer) DisconnectSslErrors() {
}
}
func (ptr *QWebSocketServer) SslErrors(erro []*network.QSslError) {
func (ptr *QWebSocketServer) SslErrors(errors []*network.QSslError) {
if ptr.Pointer() != nil {
C.QWebSocketServer_SslErrors(ptr.Pointer(), func() unsafe.Pointer {
tmpList := NewQWebSocketServerFromPointer(NewQWebSocketServerFromPointer(nil).__sslErrors_erro_newList())
for _, v := range erro {
tmpList.__sslErrors_erro_setList(v)
tmpList := NewQWebSocketServerFromPointer(NewQWebSocketServerFromPointer(nil).__sslErrors_errors_newList())
for _, v := range errors {
tmpList.__sslErrors_errors_setList(v)
}
return tmpList.Pointer()
}())

View file

@ -77,7 +77,7 @@ void QWebSocket_DisconnectError2(void* ptr);
void QWebSocket_Error2(void* ptr, long long error);
void QWebSocket_IgnoreSslErrors(void* ptr);
void QWebSocket_IgnoreSslErrorsDefault(void* ptr);
void QWebSocket_IgnoreSslErrors2(void* ptr, void* erro);
void QWebSocket_IgnoreSslErrors2(void* ptr, void* errors);
void QWebSocket_Open2(void* ptr, void* request);
void QWebSocket_Open2Default(void* ptr, void* request);
void QWebSocket_Open(void* ptr, void* url);
@ -104,7 +104,7 @@ void QWebSocket_SetReadBufferSize(void* ptr, long long size);
void QWebSocket_SetSslConfiguration(void* ptr, void* sslConfiguration);
void QWebSocket_ConnectSslErrors(void* ptr);
void QWebSocket_DisconnectSslErrors(void* ptr);
void QWebSocket_SslErrors(void* ptr, void* erro);
void QWebSocket_SslErrors(void* ptr, void* errors);
void QWebSocket_ConnectStateChanged(void* ptr);
void QWebSocket_DisconnectStateChanged(void* ptr);
void QWebSocket_StateChanged(void* ptr, long long state);
@ -212,7 +212,7 @@ void QWebSocketServer_SetServerName(void* ptr, struct QtWebSockets_PackedString
void QWebSocketServer_SetSslConfiguration(void* ptr, void* sslConfiguration);
void QWebSocketServer_ConnectSslErrors(void* ptr);
void QWebSocketServer_DisconnectSslErrors(void* ptr);
void QWebSocketServer_SslErrors(void* ptr, void* erro);
void QWebSocketServer_SslErrors(void* ptr, void* errors);
void QWebSocketServer_DestroyQWebSocketServer(void* ptr);
void QWebSocketServer_DestroyQWebSocketServerDefault(void* ptr);
void* QWebSocketServer_ServerAddress(void* ptr);