lib/cutego
1
0
Fork 0
mirror of https://github.com/bluszcz/cutego.git synced 2024-09-28 13:15:17 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix go module related issues + re-add various functions

Browse source
This commit is contained in:
therecipe 2019-09-14 19:07:15 +02:00
parent fe13d77631
commit 46e554d25d
23 changed files with 489 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
androidextras/utils-androidextras_android.go
View file

@ -17,8 +17,8 @@ func assertion(key int, input ...interface{}) (unsafe.Pointer, func()) {
return jObject.Object(), func() { jObject.DestroyQAndroidJniObject() }
case []string:
jObject := QAndroidJniObject_FromString(strings.Join(deduced, ",,,"))
jObject2 := jObject.CallObjectMethod2("split", "(Ljava/lang/String;)[Ljava/lang/String;", ",,,")
jObject := QAndroidJniObject_FromString(strings.Join(deduced, "¡¦!"))
jObject2 := jObject.CallObjectMethod2("split", "(Ljava/lang/String;)[Ljava/lang/String;", "¡¦!")
jObject.DestroyQAndroidJniObject()
return jObject2.Object(), func() { jObject2.DestroyQAndroidJniObject() }

4
internal/binding/files/utils-androidextras_android.go
View file

@ -17,8 +17,8 @@ func assertion(key int, input ...interface{}) (unsafe.Pointer, func()) {
return jObject.Object(), func() { jObject.DestroyQAndroidJniObject() }
case []string:
jObject := QAndroidJniObject_FromString(strings.Join(deduced, ",,,"))
jObject2 := jObject.CallObjectMethod2("split", "(Ljava/lang/String;)[Ljava/lang/String;", ",,,")
jObject := QAndroidJniObject_FromString(strings.Join(deduced, "¡¦!"))
jObject2 := jObject.CallObjectMethod2("split", "(Ljava/lang/String;)[Ljava/lang/String;", "¡¦!")
jObject.DestroyQAndroidJniObject()
return jObject2.Object(), func() { jObject2.DestroyQAndroidJniObject() }

14
internal/binding/parser/class_fix.go
View file

@ -168,18 +168,16 @@ func (c *Class) fixGeneral_Version() {
})
}
}
case "QDesktopWidget":
{
for _, f := range c.Functions {
f.Status = "active"
}
}
case "QWebEnginePage", "QWebEngineView", "QWebEngineClientCertificateSelection":
case "QWebEnginePage", "QWebEngineView", "QWebEngineClientCertificateSelection", "QWebEngineSettings",
"QDesktopWidget", "QQuickAsyncImageProvider":
{
for _, f := range c.Functions {
if !((f.Name == "QWebEnginePage" && f.OverloadNumber == "3") ||
(f.Name == "QWebEngineView" && f.OverloadNumber == "2")) {
(f.Name == "QWebEngineView" && f.OverloadNumber == "2") ||
f.Name == "QWebEngineSettings" && !f.Overload ||
f.Name == "QDesktopWidget" && f.Overload) {
f.Status = "active"
f.Access = "public"
}

8
internal/binding/parser/helper.go
View file

@ -2,6 +2,7 @@ package parser
import (
"bytes"
"encoding/json"
"fmt"
"runtime"
"sort"
@ -500,6 +501,9 @@ func Dump() {
var bb = new(bytes.Buffer)
defer bb.Reset()
fmt.Fprint(bb, "class\n\n")
fmt.Fprintln(bb, c)
fmt.Fprint(bb, "funcs\n\n")
for _, f := range c.Functions {
fmt.Fprintln(bb, f)
@ -510,6 +514,10 @@ func Dump() {
fmt.Fprintln(bb, e)
}
fmt.Fprint(bb, "json\n\n")
jb, _ := json.Marshal(c)
bb.Write(jb)
utils.MkdirAll(utils.GoQtPkgPath("internal", "binding", "dump", c.Module))
utils.SaveBytes(utils.GoQtPkgPath("internal", "binding", "dump", c.Module, fmt.Sprintf("%v.txt", c.Name)), bb.Bytes())
}

28
internal/binding/parser/parser.go
View file

@ -108,26 +108,14 @@ func LoadModule(m string) *Module {
case utils.QT_WEBKIT() && m == "WebKit":
err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/therecipe/qt/internal/binding/files/docs/5.8.0", "-find", "get doc dir")), fmt.Sprintf("qt%v.index", strings.ToLower(m))))), &module)
case utils.QT_MXE():
err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/therecipe/qt/internal/binding/files/docs/"+utils.QT_API("5.13.0"), "-find", "get doc dir")), fmt.Sprintf("qt%v.index", strings.ToLower(m))))), &module)
case utils.QT_HOMEBREW():
err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/therecipe/qt/internal/binding/files/docs/"+utils.QT_API("5.13.0"), "-find", "get doc dir")), fmt.Sprintf("qt%v.index", strings.ToLower(m))))), &module)
case utils.QT_MACPORTS(), utils.QT_NIX(), utils.QT_FELGO():
err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/therecipe/qt/internal/binding/files/docs/"+utils.QT_API("5.11.1"), "-find", "get doc dir")), fmt.Sprintf("qt%v.index", strings.ToLower(m))))), &module)
case utils.QT_MSYS2():
err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/therecipe/qt/internal/binding/files/docs/"+utils.QT_API("5.12.0"), "-find", "get doc dir")), fmt.Sprintf("qt%v.index", strings.ToLower(m))))), &module)
case utils.QT_UBPORTS_VERSION() == "xenial":
err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/therecipe/qt/internal/binding/files/docs/"+utils.QT_API("5.9.0"), "-find", "get doc dir")), fmt.Sprintf("qt%v.index", strings.ToLower(m))))), &module)
case utils.QT_SAILFISH():
err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/therecipe/qt/internal/binding/files/docs/"+utils.QT_API("5.6.3"), "-find", "get doc dir")), fmt.Sprintf("qt%v.index", strings.ToLower(m))))), &module)
case utils.QT_RPI():
err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/therecipe/qt/internal/binding/files/docs/"+utils.QT_API("5.7.0"), "-find", "get doc dir")), fmt.Sprintf("qt%v.index", strings.ToLower(m))))), &module)
case utils.QT_MXE(),
utils.QT_HOMEBREW(),
utils.QT_MACPORTS(), utils.QT_NIX(), utils.QT_FELGO(),
utils.QT_MSYS2(),
utils.QT_UBPORTS_VERSION() == "xenial",
utils.QT_SAILFISH(),
utils.QT_RPI():
err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/therecipe/qt/internal/binding/files/docs/"+utils.QT_API(utils.QT_VERSION()), "-find", "get doc dir")), fmt.Sprintf("qt%v.index", strings.ToLower(m))))), &module)
case utils.QT_PKG_CONFIG():
if utils.QT_API("") != "" {

4
internal/binding/templater/template_cgo_qmake.go
View file

@ -33,6 +33,10 @@ func CgoTemplateSafe(module, path, target string, mode int, ipkg, tags string, l
func cgoTemplate(module, path, target string, mode int, ipkg, tags string, libs []string) (o string) {
utils.Log.WithField("module", module).WithField("path", path).WithField("target", target).WithField("mode", mode).WithField("pkg", ipkg).Debug("running cgoTemplate")
if utils.UseGOMOD(utils.GoQtPkgPath("core")) {
utils.MkdirAll(utils.GoQtPkgPath(strings.ToLower(module)))
}
switch module {
case "AndroidExtras":
if !(target == "android" || target == "android-emulator") {

4
internal/binding/templater/templater.go
View file

@ -11,6 +11,10 @@ import (
)
func GenModule(m, target string, mode int) {
if os.Getenv("QT_DUMP") == "true" {
defer parser.Dump()
}
if !parser.ShouldBuildForTarget(m, target) {
utils.Log.WithField("module", m).Debug("skip generation")
return

7
internal/cmd/cmd.go
View file

@ -40,12 +40,17 @@ func ParseFlags() bool {
runtime.GOMAXPROCS(*p)
var forDocker bool
if d := flag.Lookup("docker"); d != nil {
forDocker = d.Value.String() == "true"
}
if api := *qt_api; api != "" {
os.Setenv("QT_API", api)
}
_, err := exec.LookPath("go")
if api := utils.QT_API(""); api != "" && err == nil && !utils.QT_DOCKER() {
if api := utils.QT_API(""); api != "" && err == nil && !utils.QT_DOCKER() && !forDocker {
if utils.GoListOptional("{{.Dir}}", "github.com/therecipe/qt/internal/binding/files/docs/"+api, "-find", "get doc dir") == "" {
utils.Log.Errorf("invalid api version provided: '%v'", api)
fmt.Println("valid api versions are:") //TODO: if only one api version is available, use it

10
internal/cmd/deploy/deploy.go
View file

@ -51,9 +51,15 @@ func Deploy(mode, target, path string, docker bool, ldFlags, tags string, fast b
utils.RunCmd(cmd, "go mod vendor")
}
if utils.QT_DOCKER() {
cmd := exec.Command("go", "get", "-v", "-d", "github.com/therecipe/qt/internal/binding/files/docs/"+utils.QT_API(utils.QT_VERSION()))
cmd := exec.Command("go", "get", "-v", "-d", "github.com/therecipe/qt/internal/binding/files/docs/"+utils.QT_API(utils.QT_VERSION())) //TODO: needs to pull 5.8.0 if QT_WEBKIT
cmd.Dir = path
utils.RunCmdOptional(cmd, "go get docs")
utils.RunCmd(cmd, "go get docs")
if strings.HasPrefix(target, "sailfish") || strings.HasPrefix(target, "android") { //TODO: generate android and sailfish minimal instead
cmd := exec.Command(filepath.Join(utils.GOBIN(), "qtsetup"), "generate", target)
cmd.Dir = path
utils.RunCmd(cmd, "run setup")
}
}
}

10
internal/cmd/minimal/minimal.go
View file

@ -27,9 +27,15 @@ func Minimal(path, target, tags string) {
utils.RunCmd(cmd, "go mod vendor")
}
if utils.QT_DOCKER() {
cmd := exec.Command("go", "get", "-v", "-d", "github.com/therecipe/qt/internal/binding/files/docs/"+utils.QT_API(utils.QT_VERSION()))
cmd := exec.Command("go", "get", "-v", "-d", "github.com/therecipe/qt/internal/binding/files/docs/"+utils.QT_API(utils.QT_VERSION())) //TODO: needs to pull 5.8.0 if QT_WEBKIT
cmd.Dir = path
utils.RunCmdOptional(cmd, "go get docs")
utils.RunCmd(cmd, "go get docs")
if strings.HasPrefix(target, "sailfish") || strings.HasPrefix(target, "android") { //TODO: generate android and sailfish minimal instead
cmd := exec.Command(filepath.Join(utils.GOBIN(), "qtsetup"), "generate", target)
cmd.Dir = path
utils.RunCmd(cmd, "run setup")
}
}
}

10
internal/cmd/moc/moc.go
View file

@ -58,9 +58,15 @@ func Moc(path, target, tags string, fast, slow, deploying bool) {
utils.RunCmd(cmd, "go mod vendor")
}
if utils.QT_DOCKER() {
cmd := exec.Command("go", "get", "-v", "-d", "github.com/therecipe/qt/internal/binding/files/docs/"+utils.QT_API(utils.QT_VERSION()))
cmd := exec.Command("go", "get", "-v", "-d", "github.com/therecipe/qt/internal/binding/files/docs/"+utils.QT_API(utils.QT_VERSION())) //TODO: needs to pull 5.8.0 if QT_WEBKIT
cmd.Dir = path
utils.RunCmdOptional(cmd, "go get docs")
utils.RunCmd(cmd, "go get docs")
if strings.HasPrefix(target, "sailfish") || strings.HasPrefix(target, "android") { //TODO: generate android and sailfish minimal instead
cmd := exec.Command(filepath.Join(utils.GOBIN(), "qtsetup"), "generate", target)
cmd.Dir = path
utils.RunCmd(cmd, "run setup")
}
}
}

10
internal/cmd/rcc/rcc.go
View file

@ -32,9 +32,15 @@ func Rcc(path, target, tagsCustom, output_dir string, useuic, quickcompiler, dep
utils.RunCmd(cmd, "go mod vendor")
}
if utils.QT_DOCKER() {
cmd := exec.Command("go", "get", "-v", "-d", "github.com/therecipe/qt/internal/binding/files/docs/"+utils.QT_API(utils.QT_VERSION()))
cmd := exec.Command("go", "get", "-v", "-d", "github.com/therecipe/qt/internal/binding/files/docs/"+utils.QT_API(utils.QT_VERSION())) //TODO: needs to pull 5.8.0 if QT_WEBKIT
cmd.Dir = path
utils.RunCmdOptional(cmd, "go get docs")
utils.RunCmd(cmd, "go get docs")
if strings.HasPrefix(target, "sailfish") || strings.HasPrefix(target, "android") { //TODO: generate android and sailfish minimal instead
cmd := exec.Command(filepath.Join(utils.GOBIN(), "qtsetup"), "generate", target)
cmd.Dir = path
utils.RunCmd(cmd, "run setup")
}
}
}

2
internal/docker/sailfish/Dockerfile
View file

@ -73,6 +73,8 @@ RUN ln -s $SF_SDK_TOOLING_DIR/usr/lib/libglib-2.0.so.0 /usr/lib/
RUN ln -s $SF_SDK_TOOLING_DIR/usr/lib/libpcre.so.1 /usr/lib/
RUN ln -s $SF_SDK_TOOLING_DIR/usr/lib/libdw.so.1 /usr/lib/
RUN ln -s $SF_SDK_TOOLING_DIR/lib/libcrypto.so.10 /usr/lib/
RUN $GOPATH/bin/qtsetup prep
RUN $GOPATH/bin/qtsetup generate sailfish

41
internal/utils/env.go
View file

@ -20,7 +20,30 @@ func QT_VERSION() string {
if version, ok := os.LookupEnv("QT_VERSION"); ok {
return version
}
if QT_PKG_CONFIG() {
switch {
case QT_MXE():
return "5.13.0"
case os.Getenv("QT_HOMEBREW") == "true":
return "5.13.0"
case QT_MACPORTS(), QT_NIX(), QT_FELGO():
return "5.11.1"
case QT_MSYS2():
return "5.12.0"
case QT_UBPORTS_VERSION() == "xenial":
return "5.9.0"
case QT_SAILFISH():
return "5.6.3"
case QT_RPI():
return "5.7.0"
case QT_PKG_CONFIG():
var r string
qtVersionCacheMutex.Lock()
if qtVersionCache == "" {
@ -29,14 +52,10 @@ func QT_VERSION() string {
r = qtVersionCache
qtVersionCacheMutex.Unlock()
return r
}
//TODO: proper def version for macports, mxe, msys, homebrew, ...
if QT_FELGO() {
return "5.11.1"
default:
return "5.13.0"
}
return "5.13.0"
}
func QT_VERSION_NUM() int {
@ -440,11 +459,13 @@ func GOVERSION() (r string) {
return "go1.10"
}
goVersionCacheMutex.Lock()
var version string
if goVersionCache == "" {
goVersionCache = strings.Split(RunCmd(exec.Command("go", "version"), "get go version"), " ")[2]
version = RunCmd(exec.Command("go", "version"), "get go version")
goVersionCache = strings.Split(version, " ")[2]
}
if strings.Contains(goVersionCache, "devel") {
if strings.Contains(goVersionCache, "+6741b7009d") { //go build that supports the msvc
if strings.Contains(version, "devel") {
if strings.Contains(version, "+6741b7009d") { //go build that supports the msvc
goVersionCache = "go1.10"
} else {
goVersionCache = "go1.13"

18
quick/quick.cpp
View file

@ -128,7 +128,9 @@
class MyQQuickAsyncImageProvider: public QQuickAsyncImageProvider
{
public:
MyQQuickAsyncImageProvider() : QQuickAsyncImageProvider() {};
QQuickImageResponse * requestImageResponse(const QString & id, const QSize & requestedSize) { QByteArray t87ea5d = id.toUtf8(); QtQuick_PackedString idPacked = { const_cast<char*>(t87ea5d.prepend("WHITESPACE").constData()+10), t87ea5d.size()-10 };return static_cast<QQuickImageResponse*>(callbackQQuickAsyncImageProvider_RequestImageResponse(this, idPacked, const_cast<QSize*>(&requestedSize))); };
~MyQQuickAsyncImageProvider() { callbackQQuickAsyncImageProvider_DestroyQQuickAsyncImageProvider(this); };
QQmlImageProviderBase::Flags flags() const { return static_cast<QQmlImageProviderBase::Flag>(callbackQQuickImageProvider_Flags(const_cast<void*>(static_cast<const void*>(this)))); };
QQmlImageProviderBase::ImageType imageType() const { return static_cast<QQmlImageProviderBase::ImageType>(callbackQQuickImageProvider_ImageType(const_cast<void*>(static_cast<const void*>(this)))); };
QImage requestImage(const QString & id, QSize * size, const QSize & requestedSize) { QByteArray t87ea5d = id.toUtf8(); QtQuick_PackedString idPacked = { const_cast<char*>(t87ea5d.prepend("WHITESPACE").constData()+10), t87ea5d.size()-10 };return *static_cast<QImage*>(callbackQQuickImageProvider_RequestImage(this, idPacked, size, const_cast<QSize*>(&requestedSize))); };
@ -136,11 +138,27 @@ public:
QQuickTextureFactory * requestTexture(const QString & id, QSize * size, const QSize & requestedSize) { QByteArray t87ea5d = id.toUtf8(); QtQuick_PackedString idPacked = { const_cast<char*>(t87ea5d.prepend("WHITESPACE").constData()+10), t87ea5d.size()-10 };return static_cast<QQuickTextureFactory*>(callbackQQuickImageProvider_RequestTexture(this, idPacked, size, const_cast<QSize*>(&requestedSize))); };
};
void* QQuickAsyncImageProvider_NewQQuickAsyncImageProvider()
{
return new MyQQuickAsyncImageProvider();
}
void* QQuickAsyncImageProvider_RequestImageResponse(void* ptr, struct QtQuick_PackedString id, void* requestedSize)
{
return static_cast<QQuickAsyncImageProvider*>(ptr)->requestImageResponse(QString::fromUtf8(id.data, id.len), *static_cast<QSize*>(requestedSize));
}
void QQuickAsyncImageProvider_DestroyQQuickAsyncImageProvider(void* ptr)
{
static_cast<QQuickAsyncImageProvider*>(ptr)->~QQuickAsyncImageProvider();
}
void QQuickAsyncImageProvider_DestroyQQuickAsyncImageProviderDefault(void* ptr)
{
Q_UNUSED(ptr);
}
class MyQQuickFramebufferObject: public QQuickFramebufferObject
{
public:

55
quick/quick.go
View file

@ -1580,14 +1580,8 @@ func NewQQuickAsyncImageProviderFromPointer(ptr unsafe.Pointer) (n *QQuickAsyncI
n.SetPointer(ptr)
return
}
func (ptr *QQuickAsyncImageProvider) DestroyQQuickAsyncImageProvider() {
if ptr != nil {
C.free(ptr.Pointer())
qt.DisconnectAllSignals(ptr.Pointer(), "")
ptr.SetPointer(nil)
runtime.SetFinalizer(ptr, nil)
}
func NewQQuickAsyncImageProvider() *QQuickAsyncImageProvider {
return NewQQuickAsyncImageProviderFromPointer(C.QQuickAsyncImageProvider_NewQQuickAsyncImageProvider())
}
//export callbackQQuickAsyncImageProvider_RequestImageResponse
@ -1637,6 +1631,51 @@ func (ptr *QQuickAsyncImageProvider) RequestImageResponse(id string, requestedSi
return nil
}
//export callbackQQuickAsyncImageProvider_DestroyQQuickAsyncImageProvider
func callbackQQuickAsyncImageProvider_DestroyQQuickAsyncImageProvider(ptr unsafe.Pointer) {
if signal := qt.GetSignal(ptr, "~QQuickAsyncImageProvider"); signal != nil {
(*(*func())(signal))()
} else {
NewQQuickAsyncImageProviderFromPointer(ptr).DestroyQQuickAsyncImageProviderDefault()
}
}
func (ptr *QQuickAsyncImageProvider) ConnectDestroyQQuickAsyncImageProvider(f func()) {
if ptr.Pointer() != nil {
if signal := qt.LendSignal(ptr.Pointer(), "~QQuickAsyncImageProvider"); signal != nil {
f := func() {
(*(*func())(signal))()
f()
}
qt.ConnectSignal(ptr.Pointer(), "~QQuickAsyncImageProvider", unsafe.Pointer(&f))
} else {
qt.ConnectSignal(ptr.Pointer(), "~QQuickAsyncImageProvider", unsafe.Pointer(&f))
}
}
}
func (ptr *QQuickAsyncImageProvider) DisconnectDestroyQQuickAsyncImageProvider() {
if ptr.Pointer() != nil {
qt.DisconnectSignal(ptr.Pointer(), "~QQuickAsyncImageProvider")
}
}
func (ptr *QQuickAsyncImageProvider) DestroyQQuickAsyncImageProvider() {
if ptr.Pointer() != nil {
C.QQuickAsyncImageProvider_DestroyQQuickAsyncImageProvider(ptr.Pointer())
ptr.SetPointer(nil)
}
}
func (ptr *QQuickAsyncImageProvider) DestroyQQuickAsyncImageProviderDefault() {
if ptr.Pointer() != nil {
C.QQuickAsyncImageProvider_DestroyQQuickAsyncImageProviderDefault(ptr.Pointer())
ptr.SetPointer(nil)
}
}
type QQuickFolderListModel struct {
core.QAbstractListModel
qml.QQmlParserStatus

3
quick/quick.h
View file

@ -30,7 +30,10 @@ extern "C" {
struct QtQuick_PackedString { char* data; long long len; };
struct QtQuick_PackedList { void* data; long long len; };
void* QQuickAsyncImageProvider_NewQQuickAsyncImageProvider();
void* QQuickAsyncImageProvider_RequestImageResponse(void* ptr, struct QtQuick_PackedString id, void* requestedSize);
void QQuickAsyncImageProvider_DestroyQQuickAsyncImageProvider(void* ptr);
void QQuickAsyncImageProvider_DestroyQQuickAsyncImageProviderDefault(void* ptr);
char QQuickFramebufferObject_MirrorVertically(void* ptr);
void QQuickFramebufferObject_ConnectMirrorVerticallyChanged(void* ptr);
void QQuickFramebufferObject_DisconnectMirrorVerticallyChanged(void* ptr);

91
webengine/webengine.cpp
View file

@ -86,6 +86,7 @@
#include <QWebEngineProfile>
#include <QWebEngineQuotaRequest>
#include <QWebEngineRegisterProtocolHandlerRequest>
#include <QWebEngineSettings>
#include <QWebEngineUrlRequestInfo>
#include <QWebEngineUrlRequestInterceptor>
#include <QWebEngineUrlRequestJob>
@ -2853,6 +2854,96 @@ struct QtWebEngine_PackedString QWebEngineRegisterProtocolHandlerRequest_Scheme(
return ({ QByteArray t21b2e9 = static_cast<QWebEngineRegisterProtocolHandlerRequest*>(ptr)->scheme().toUtf8(); QtWebEngine_PackedString { const_cast<char*>(t21b2e9.prepend("WHITESPACE").constData()+10), t21b2e9.size()-10 }; });
}
void* QWebEngineSettings_NewQWebEngineSettings2(void* parentSettings)
{
return new QWebEngineSettings(static_cast<QWebEngineSettings*>(parentSettings));
}
void* QWebEngineSettings_QWebEngineSettings_DefaultSettings()
{
return QWebEngineSettings::defaultSettings();
}
struct QtWebEngine_PackedString QWebEngineSettings_DefaultTextEncoding(void* ptr)
{
return ({ QByteArray t01cf63 = static_cast<QWebEngineSettings*>(ptr)->defaultTextEncoding().toUtf8(); QtWebEngine_PackedString { const_cast<char*>(t01cf63.prepend("WHITESPACE").constData()+10), t01cf63.size()-10 }; });
}
struct QtWebEngine_PackedString QWebEngineSettings_FontFamily(void* ptr, long long which)
{
return ({ QByteArray t118959 = static_cast<QWebEngineSettings*>(ptr)->fontFamily(static_cast<QWebEngineSettings::FontFamily>(which)).toUtf8(); QtWebEngine_PackedString { const_cast<char*>(t118959.prepend("WHITESPACE").constData()+10), t118959.size()-10 }; });
}
int QWebEngineSettings_FontSize(void* ptr, long long ty)
{
return static_cast<QWebEngineSettings*>(ptr)->fontSize(static_cast<QWebEngineSettings::FontSize>(ty));
}
void* QWebEngineSettings_QWebEngineSettings_GlobalSettings()
{
return QWebEngineSettings::globalSettings();
}
void QWebEngineSettings_ResetAttribute(void* ptr, long long attr)
{
static_cast<QWebEngineSettings*>(ptr)->resetAttribute(static_cast<QWebEngineSettings::WebAttribute>(attr));
}
void QWebEngineSettings_ResetFontFamily(void* ptr, long long which)
{
static_cast<QWebEngineSettings*>(ptr)->resetFontFamily(static_cast<QWebEngineSettings::FontFamily>(which));
}
void QWebEngineSettings_ResetFontSize(void* ptr, long long ty)
{
static_cast<QWebEngineSettings*>(ptr)->resetFontSize(static_cast<QWebEngineSettings::FontSize>(ty));
}
void QWebEngineSettings_ResetUnknownUrlSchemePolicy(void* ptr)
{
static_cast<QWebEngineSettings*>(ptr)->resetUnknownUrlSchemePolicy();
}
void QWebEngineSettings_SetAttribute(void* ptr, long long attr, char on)
{
static_cast<QWebEngineSettings*>(ptr)->setAttribute(static_cast<QWebEngineSettings::WebAttribute>(attr), on != 0);
}
void QWebEngineSettings_SetDefaultTextEncoding(void* ptr, struct QtWebEngine_PackedString encoding)
{
static_cast<QWebEngineSettings*>(ptr)->setDefaultTextEncoding(QString::fromUtf8(encoding.data, encoding.len));
}
void QWebEngineSettings_SetFontFamily(void* ptr, long long which, struct QtWebEngine_PackedString family)
{
static_cast<QWebEngineSettings*>(ptr)->setFontFamily(static_cast<QWebEngineSettings::FontFamily>(which), QString::fromUtf8(family.data, family.len));
}
void QWebEngineSettings_SetFontSize(void* ptr, long long ty, int size)
{
static_cast<QWebEngineSettings*>(ptr)->setFontSize(static_cast<QWebEngineSettings::FontSize>(ty), size);
}
void QWebEngineSettings_SetUnknownUrlSchemePolicy(void* ptr, long long policy)
{
static_cast<QWebEngineSettings*>(ptr)->setUnknownUrlSchemePolicy(static_cast<QWebEngineSettings::UnknownUrlSchemePolicy>(policy));
}
char QWebEngineSettings_TestAttribute(void* ptr, long long attr)
{
return static_cast<QWebEngineSettings*>(ptr)->testAttribute(static_cast<QWebEngineSettings::WebAttribute>(attr));
}
long long QWebEngineSettings_UnknownUrlSchemePolicy(void* ptr)
{
return static_cast<QWebEngineSettings*>(ptr)->unknownUrlSchemePolicy();
}
void QWebEngineSettings_DestroyQWebEngineSettings(void* ptr)
{
static_cast<QWebEngineSettings*>(ptr)->~QWebEngineSettings();
}
void QWebEngineUrlRequestInfo_Block(void* ptr, char shouldBlock)
{
static_cast<QWebEngineUrlRequestInfo*>(ptr)->block(shouldBlock != 0);

137
webengine/webengine.go
View file

@ -6639,14 +6639,6 @@ func NewQWebEngineSettingsFromPointer(ptr unsafe.Pointer) (n *QWebEngineSettings
return
}
func (ptr *QWebEngineSettings) DestroyQWebEngineSettings() {
if ptr != nil {
C.free(ptr.Pointer())
ptr.SetPointer(nil)
runtime.SetFinalizer(ptr, nil)
}
}
//go:generate stringer -type=QWebEngineSettings__FontFamily
//QWebEngineSettings::FontFamily
type QWebEngineSettings__FontFamily int64
@ -6720,6 +6712,135 @@ const (
QWebEngineSettings__AllowAllUnknownUrlSchemes QWebEngineSettings__UnknownUrlSchemePolicy = QWebEngineSettings__UnknownUrlSchemePolicy(3)
)
func NewQWebEngineSettings2(parentSettings QWebEngineSettings_ITF) *QWebEngineSettings {
tmpValue := NewQWebEngineSettingsFromPointer(C.QWebEngineSettings_NewQWebEngineSettings2(PointerFromQWebEngineSettings(parentSettings)))
runtime.SetFinalizer(tmpValue, (*QWebEngineSettings).DestroyQWebEngineSettings)
return tmpValue
}
func QWebEngineSettings_DefaultSettings() *QWebEngineSettings {
return NewQWebEngineSettingsFromPointer(C.QWebEngineSettings_QWebEngineSettings_DefaultSettings())
}
func (ptr *QWebEngineSettings) DefaultSettings() *QWebEngineSettings {
return NewQWebEngineSettingsFromPointer(C.QWebEngineSettings_QWebEngineSettings_DefaultSettings())
}
func (ptr *QWebEngineSettings) DefaultTextEncoding() string {
if ptr.Pointer() != nil {
return cGoUnpackString(C.QWebEngineSettings_DefaultTextEncoding(ptr.Pointer()))
}
return ""
}
func (ptr *QWebEngineSettings) FontFamily(which QWebEngineSettings__FontFamily) string {
if ptr.Pointer() != nil {
return cGoUnpackString(C.QWebEngineSettings_FontFamily(ptr.Pointer(), C.longlong(which)))
}
return ""
}
func (ptr *QWebEngineSettings) FontSize(ty QWebEngineSettings__FontSize) int {
if ptr.Pointer() != nil {
return int(int32(C.QWebEngineSettings_FontSize(ptr.Pointer(), C.longlong(ty))))
}
return 0
}
func QWebEngineSettings_GlobalSettings() *QWebEngineSettings {
return NewQWebEngineSettingsFromPointer(C.QWebEngineSettings_QWebEngineSettings_GlobalSettings())
}
func (ptr *QWebEngineSettings) GlobalSettings() *QWebEngineSettings {
return NewQWebEngineSettingsFromPointer(C.QWebEngineSettings_QWebEngineSettings_GlobalSettings())
}
func (ptr *QWebEngineSettings) ResetAttribute(attr QWebEngineSettings__WebAttribute) {
if ptr.Pointer() != nil {
C.QWebEngineSettings_ResetAttribute(ptr.Pointer(), C.longlong(attr))
}
}
func (ptr *QWebEngineSettings) ResetFontFamily(which QWebEngineSettings__FontFamily) {
if ptr.Pointer() != nil {
C.QWebEngineSettings_ResetFontFamily(ptr.Pointer(), C.longlong(which))
}
}
func (ptr *QWebEngineSettings) ResetFontSize(ty QWebEngineSettings__FontSize) {
if ptr.Pointer() != nil {
C.QWebEngineSettings_ResetFontSize(ptr.Pointer(), C.longlong(ty))
}
}
func (ptr *QWebEngineSettings) ResetUnknownUrlSchemePolicy() {
if ptr.Pointer() != nil {
C.QWebEngineSettings_ResetUnknownUrlSchemePolicy(ptr.Pointer())
}
}
func (ptr *QWebEngineSettings) SetAttribute(attr QWebEngineSettings__WebAttribute, on bool) {
if ptr.Pointer() != nil {
C.QWebEngineSettings_SetAttribute(ptr.Pointer(), C.longlong(attr), C.char(int8(qt.GoBoolToInt(on))))
}
}
func (ptr *QWebEngineSettings) SetDefaultTextEncoding(encoding string) {
if ptr.Pointer() != nil {
var encodingC *C.char
if encoding != "" {
encodingC = C.CString(encoding)
defer C.free(unsafe.Pointer(encodingC))
}
C.QWebEngineSettings_SetDefaultTextEncoding(ptr.Pointer(), C.struct_QtWebEngine_PackedString{data: encodingC, len: C.longlong(len(encoding))})
}
}
func (ptr *QWebEngineSettings) SetFontFamily(which QWebEngineSettings__FontFamily, family string) {
if ptr.Pointer() != nil {
var familyC *C.char
if family != "" {
familyC = C.CString(family)
defer C.free(unsafe.Pointer(familyC))
}
C.QWebEngineSettings_SetFontFamily(ptr.Pointer(), C.longlong(which), C.struct_QtWebEngine_PackedString{data: familyC, len: C.longlong(len(family))})
}
}
func (ptr *QWebEngineSettings) SetFontSize(ty QWebEngineSettings__FontSize, size int) {
if ptr.Pointer() != nil {
C.QWebEngineSettings_SetFontSize(ptr.Pointer(), C.longlong(ty), C.int(int32(size)))
}
}
func (ptr *QWebEngineSettings) SetUnknownUrlSchemePolicy(policy QWebEngineSettings__UnknownUrlSchemePolicy) {
if ptr.Pointer() != nil {
C.QWebEngineSettings_SetUnknownUrlSchemePolicy(ptr.Pointer(), C.longlong(policy))
}
}
func (ptr *QWebEngineSettings) TestAttribute(attr QWebEngineSettings__WebAttribute) bool {
if ptr.Pointer() != nil {
return int8(C.QWebEngineSettings_TestAttribute(ptr.Pointer(), C.longlong(attr))) != 0
}
return false
}
func (ptr *QWebEngineSettings) UnknownUrlSchemePolicy() QWebEngineSettings__UnknownUrlSchemePolicy {
if ptr.Pointer() != nil {
return QWebEngineSettings__UnknownUrlSchemePolicy(C.QWebEngineSettings_UnknownUrlSchemePolicy(ptr.Pointer()))
}
return 0
}
func (ptr *QWebEngineSettings) DestroyQWebEngineSettings() {
if ptr.Pointer() != nil {
C.QWebEngineSettings_DestroyQWebEngineSettings(ptr.Pointer())
ptr.SetPointer(nil)
runtime.SetFinalizer(ptr, nil)
}
}
type QWebEngineUrlRequestInfo struct {
ptr unsafe.Pointer
}

18
webengine/webengine.h
View file

@ -496,6 +496,24 @@ void QWebEngineRegisterProtocolHandlerRequest_Accept(void* ptr);
void* QWebEngineRegisterProtocolHandlerRequest_Origin(void* ptr);
void QWebEngineRegisterProtocolHandlerRequest_Reject(void* ptr);
struct QtWebEngine_PackedString QWebEngineRegisterProtocolHandlerRequest_Scheme(void* ptr);
void* QWebEngineSettings_NewQWebEngineSettings2(void* parentSettings);
void* QWebEngineSettings_QWebEngineSettings_DefaultSettings();
struct QtWebEngine_PackedString QWebEngineSettings_DefaultTextEncoding(void* ptr);
struct QtWebEngine_PackedString QWebEngineSettings_FontFamily(void* ptr, long long which);
int QWebEngineSettings_FontSize(void* ptr, long long ty);
void* QWebEngineSettings_QWebEngineSettings_GlobalSettings();
void QWebEngineSettings_ResetAttribute(void* ptr, long long attr);
void QWebEngineSettings_ResetFontFamily(void* ptr, long long which);
void QWebEngineSettings_ResetFontSize(void* ptr, long long ty);
void QWebEngineSettings_ResetUnknownUrlSchemePolicy(void* ptr);
void QWebEngineSettings_SetAttribute(void* ptr, long long attr, char on);
void QWebEngineSettings_SetDefaultTextEncoding(void* ptr, struct QtWebEngine_PackedString encoding);
void QWebEngineSettings_SetFontFamily(void* ptr, long long which, struct QtWebEngine_PackedString family);
void QWebEngineSettings_SetFontSize(void* ptr, long long ty, int size);
void QWebEngineSettings_SetUnknownUrlSchemePolicy(void* ptr, long long policy);
char QWebEngineSettings_TestAttribute(void* ptr, long long attr);
long long QWebEngineSettings_UnknownUrlSchemePolicy(void* ptr);
void QWebEngineSettings_DestroyQWebEngineSettings(void* ptr);
void QWebEngineUrlRequestInfo_Block(void* ptr, char shouldBlock);
void* QWebEngineUrlRequestInfo_FirstPartyUrl(void* ptr);
long long QWebEngineUrlRequestInfo_NavigationType(void* ptr);

22
widgets/widgets.cpp
View file

@ -10970,10 +10970,14 @@ void QDateTimeEdit_DestroyQDateTimeEditDefault(void* ptr)
class MyQDesktopWidget: public QDesktopWidget
{
public:
MyQDesktopWidget() : QDesktopWidget() {QDesktopWidget_QDesktopWidget_QRegisterMetaType();};
const QMetaObject * metaObject() const { return static_cast<QMetaObject*>(callbackQWidget_MetaObject(const_cast<void*>(static_cast<const void*>(this)))); };
void Signal_PrimaryScreenChanged() { callbackQDesktopWidget_PrimaryScreenChanged(this); };
void resizeEvent(QResizeEvent * e) { callbackQWidget_ResizeEvent(this, e); };
void Signal_Resized(int screen) { callbackQDesktopWidget_Resized(this, screen); };
void Signal_ScreenCountChanged(int newCount) { callbackQDesktopWidget_ScreenCountChanged(this, newCount); };
void Signal_WorkAreaResized(int screen) { callbackQDesktopWidget_WorkAreaResized(this, screen); };
~MyQDesktopWidget() { callbackQDesktopWidget_DestroyQDesktopWidget(this); };
void actionEvent(QActionEvent * event) { callbackQWidget_ActionEvent(this, event); };
void changeEvent(QEvent * event) { callbackQWidget_ChangeEvent(this, event); };
bool close() { return callbackQWidget_Close(this) != 0; };
@ -11012,7 +11016,6 @@ public:
void paintEvent(QPaintEvent * event) { callbackQWidget_PaintEvent(this, event); };
void raise() { callbackQWidget_Raise(this); };
void repaint() { callbackQWidget_Repaint(this); };
void resizeEvent(QResizeEvent * event) { callbackQWidget_ResizeEvent(this, event); };
void setDisabled(bool disable) { callbackQWidget_SetDisabled(this, disable); };
void setEnabled(bool vbo) { callbackQWidget_SetEnabled(this, vbo); };
void setFocus() { callbackQWidget_SetFocus2(this); };
@ -11041,7 +11044,6 @@ public:
void Signal_Destroyed(QObject * obj) { callbackQWidget_Destroyed(this, obj); };
void disconnectNotify(const QMetaMethod & sign) { callbackQWidget_DisconnectNotify(this, const_cast<QMetaMethod*>(&sign)); };
bool eventFilter(QObject * watched, QEvent * event) { return callbackQWidget_EventFilter(this, watched, event) != 0; };
const QMetaObject * metaObject() const { return static_cast<QMetaObject*>(callbackQWidget_MetaObject(const_cast<void*>(static_cast<const void*>(this)))); };
void Signal_ObjectNameChanged(const QString & objectName) { QByteArray taa2c4f = objectName.toUtf8(); QtWidgets_PackedString objectNamePacked = { const_cast<char*>(taa2c4f.prepend("WHITESPACE").constData()+10), taa2c4f.size()-10 };callbackQWidget_ObjectNameChanged(this, objectNamePacked); };
void timerEvent(QTimerEvent * event) { callbackQWidget_TimerEvent(this, event); };
};
@ -11050,6 +11052,11 @@ Q_DECLARE_METATYPE(MyQDesktopWidget*)
int QDesktopWidget_QDesktopWidget_QRegisterMetaType(){qRegisterMetaType<QDesktopWidget*>(); return qRegisterMetaType<MyQDesktopWidget*>();}
void* QDesktopWidget_NewQDesktopWidget()
{
return new MyQDesktopWidget();
}
void* QDesktopWidget_AvailableGeometry(void* ptr, int screen)
{
return ({ QRect tmpValue = static_cast<QDesktopWidget*>(ptr)->availableGeometry(screen); new QRect(tmpValue.x(), tmpValue.y(), tmpValue.width(), tmpValue.height()); });
@ -11165,6 +11172,17 @@ void QDesktopWidget_WorkAreaResized(void* ptr, int screen)
static_cast<QDesktopWidget*>(ptr)->workAreaResized(screen);
}
void QDesktopWidget_DestroyQDesktopWidget(void* ptr)
{
static_cast<QDesktopWidget*>(ptr)->~QDesktopWidget();
}
void QDesktopWidget_DestroyQDesktopWidgetDefault(void* ptr)
{
Q_UNUSED(ptr);
}
class MyQDial: public QDial
{
public:

55
widgets/widgets.go
View file

@ -19553,6 +19553,14 @@ func NewQDesktopWidgetFromPointer(ptr unsafe.Pointer) (n *QDesktopWidget) {
n.SetPointer(ptr)
return
}
func NewQDesktopWidget() *QDesktopWidget {
tmpValue := NewQDesktopWidgetFromPointer(C.QDesktopWidget_NewQDesktopWidget())
if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") {
tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) })
}
return tmpValue
}
func (ptr *QDesktopWidget) AvailableGeometry(screen int) *core.QRect {
if ptr.Pointer() != nil {
tmpValue := core.NewQRectFromPointer(C.QDesktopWidget_AvailableGeometry(ptr.Pointer(), C.int(int32(screen))))
@ -19802,6 +19810,53 @@ func (ptr *QDesktopWidget) WorkAreaResized(screen int) {
}
}
//export callbackQDesktopWidget_DestroyQDesktopWidget
func callbackQDesktopWidget_DestroyQDesktopWidget(ptr unsafe.Pointer) {
if signal := qt.GetSignal(ptr, "~QDesktopWidget"); signal != nil {
(*(*func())(signal))()
} else {
NewQDesktopWidgetFromPointer(ptr).DestroyQDesktopWidgetDefault()
}
}
func (ptr *QDesktopWidget) ConnectDestroyQDesktopWidget(f func()) {
if ptr.Pointer() != nil {
if signal := qt.LendSignal(ptr.Pointer(), "~QDesktopWidget"); signal != nil {
f := func() {
(*(*func())(signal))()
f()
}
qt.ConnectSignal(ptr.Pointer(), "~QDesktopWidget", unsafe.Pointer(&f))
} else {
qt.ConnectSignal(ptr.Pointer(), "~QDesktopWidget", unsafe.Pointer(&f))
}
}
}
func (ptr *QDesktopWidget) DisconnectDestroyQDesktopWidget() {
if ptr.Pointer() != nil {
qt.DisconnectSignal(ptr.Pointer(), "~QDesktopWidget")
}
}
func (ptr *QDesktopWidget) DestroyQDesktopWidget() {
if ptr.Pointer() != nil {
C.QDesktopWidget_DestroyQDesktopWidget(ptr.Pointer())
ptr.SetPointer(nil)
runtime.SetFinalizer(ptr, nil)
}
}
func (ptr *QDesktopWidget) DestroyQDesktopWidgetDefault() {
if ptr.Pointer() != nil {
C.QDesktopWidget_DestroyQDesktopWidgetDefault(ptr.Pointer())
ptr.SetPointer(nil)
runtime.SetFinalizer(ptr, nil)
}
}
type QDial struct {
QAbstractSlider
}

3
widgets/widgets.h
View file

@ -1473,6 +1473,7 @@ void QDateTimeEdit_TimeChanged(void* ptr, void* ti);
long long QDateTimeEdit_TimeSpec(void* ptr);
void QDateTimeEdit_DestroyQDateTimeEdit(void* ptr);
void QDateTimeEdit_DestroyQDateTimeEditDefault(void* ptr);
void* QDesktopWidget_NewQDesktopWidget();
void* QDesktopWidget_AvailableGeometry(void* ptr, int screen);
void* QDesktopWidget_AvailableGeometry2(void* ptr, void* widget);
char QDesktopWidget_IsVirtualDesktop(void* ptr);
@ -1496,6 +1497,8 @@ int QDesktopWidget_ScreenNumber2(void* ptr, void* point);
void QDesktopWidget_ConnectWorkAreaResized(void* ptr);
void QDesktopWidget_DisconnectWorkAreaResized(void* ptr);
void QDesktopWidget_WorkAreaResized(void* ptr, int screen);
void QDesktopWidget_DestroyQDesktopWidget(void* ptr);
void QDesktopWidget_DestroyQDesktopWidgetDefault(void* ptr);
void* QDial_NewQDial(void* parent);
void QDial_InitStyleOption(void* ptr, void* option);
int QDial_NotchSize(void* ptr);