fix webkit issue + homebrew deployments + update readme

This commit is contained in:
therecipe 2017-09-20 01:19:37 +02:00
parent 27a2608e6c
commit 3725b223d2
3 changed files with 10 additions and 8 deletions

View file

@ -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
---

View file

@ -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():

View file

@ -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))
}
case "linux", "rpi1", "rpi2", "rpi3":