diff --git a/README.md b/README.md index 6645b337..763348d4 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ The main target of this binding are : 1. easing the development of GUI application by making Qt's API accessible from Go; and 2. simplifying the development and deployment processes to multiple platforms. -Even though this binding is still work in progress, it's quite stable and most of Qt's API is already accessible from this binding, so it should already contain everything you need to build a fully featured applications. If you still missing something, feel free to open an issue. +Even though this binding is still work in progress, it's quite stable and most of Qt's API is already accessible from this binding, so it should already contain everything you need to build a fully featured applications. If you still missing something, feel free to open an issue. Do note that there are no `godoc` entry for this package, because most of binding code is generated by [generator](https://github.com/therecipe/qt/tree/master/internal/binding). However, when building Qt app you can use official [Qt documentation](https://doc.qt.io/qt-5/classes.html) because almost every Qt's API is mapped by this binding to same or predictable name in Go. @@ -47,13 +47,17 @@ Like any other GitHub projects, you can ask your question by creating new issue. Besides the official examples, you can also check these 3rd party examples from the community : - [5k3105/AM](https://github.com/5k3105/AM) +- [5k3105/Coral](https://github.com/5k3105/Coral) - [5k3105/Pipeline-Editor](https://github.com/5k3105/Pipeline-Editor) - [5k3105/Sprite-Editor](https://github.com/5k3105/Sprite-Editor) +- [5k3105/Tree-Edit-Example](https://github.com/5k3105/Tree-Edit-Example) - [gen2brain/url2img](https://github.com/gen2brain/url2img) - [joeblew99/qt-archi](https://github.com/joeblew99/qt-archi) - [jordanorelli/grpc-ui](https://github.com/jordanorelli/grpc-ui) - [Pragma-innovation/bgpflowspectool](https://github.com/Pragma-innovation/bgpflowspectool) +Feel free to add your project here! + License --- diff --git a/internal/binding/parser/parser.go b/internal/binding/parser/parser.go index c4b0d51a..7d107bd8 100644 --- a/internal/binding/parser/parser.go +++ b/internal/binding/parser/parser.go @@ -66,7 +66,7 @@ func LoadModule(m string) *Module { if utils.QT_HOMEBREW() { err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(utils.MustGoPath(), "src", "github.com", "therecipe", "qt", "internal", "binding", "files", "docs", "5.7.1", fmt.Sprintf("qt%v.index", strings.ToLower(m))))), &module) } else { - err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(utils.MustGoPath(), "src", "github.com", "therecipe", "qt", "internal", "binding", "files", "docs", utils.QT_VERSION(), fmt.Sprintf("qt%v.index", strings.ToLower(m))))), &module) + err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(utils.MustGoPath(), "src", "github.com", "therecipe", "qt", "internal", "binding", "files", "docs", "5.8.0", fmt.Sprintf("qt%v.index", strings.ToLower(m))))), &module) } case utils.QT_MSYS2() && utils.QT_MSYS2_STATIC(): diff --git a/internal/cmd/deploy/bundle.go b/internal/cmd/deploy/bundle.go index c283edd2..515e0462 100644 --- a/internal/cmd/deploy/bundle.go +++ b/internal/cmd/deploy/bundle.go @@ -63,12 +63,10 @@ func bundle(mode, target, path, name, depPath string) { utils.MkdirAll(assets) copy(assets+"/", filepath.Join(depPath, name+".app")) - if !utils.QT_HOMEBREW() { - dep := exec.Command(filepath.Join(utils.QT_DARWIN_DIR(), "bin", "macdeployqt")) - dep.Args = append(dep.Args, filepath.Join(depPath, name+".app"), "-qmldir="+path) - dep.Dir = filepath.Join(utils.QT_DARWIN_DIR(), "bin") - utils.RunCmd(dep, fmt.Sprintf("deploy for %v on %v", target, runtime.GOOS)) - } + dep := exec.Command(filepath.Join(utils.QT_DARWIN_DIR(), "bin", "macdeployqt")) + dep.Args = append(dep.Args, filepath.Join(depPath, name+".app"), "-qmldir="+path) + dep.Dir = filepath.Join(utils.QT_DARWIN_DIR(), "bin") + utils.RunCmd(dep, fmt.Sprintf("deploy for %v on %v", target, runtime.GOOS)) case "linux", "rpi1", "rpi2", "rpi3":