From 959859c19a073282c70fcbd987eba5f9d8a83e51 Mon Sep 17 00:00:00 2001 From: StarAurryon Date: Thu, 30 Jul 2020 23:50:37 +0200 Subject: [PATCH 1/9] Fixing qtmoc not handling pointer to object in QT signal properly: the callback is returning the value of the pointer instead of the pointer --- internal/binding/templater/function_go.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/internal/binding/templater/function_go.go b/internal/binding/templater/function_go.go index 87ccb1d98..e1afffe6c 100644 --- a/internal/binding/templater/function_go.go +++ b/internal/binding/templater/function_go.go @@ -364,7 +364,11 @@ func goFunctionBody(function *parser.Function) string { if !strings.HasSuffix(function.Name, "Changed") { //TODO: check if property instead fmt.Fprintf(bb, "qt.UnregisterTemp(unsafe.Pointer(uintptr(%v)))\n", parser.CleanName(p.Name, p.Value)) } - fmt.Fprintf(bb, "%[1]vD = (*(*%v)(%[1]vI))\n", parser.CleanName(p.Name, p.Value), p.PureGoType) + if strings.HasPrefix(p.PureGoType, "*") { + fmt.Fprintf(bb, "%[1]vD = (%v)(%[1]vI)\n", parser.CleanName(p.Name, p.Value), p.PureGoType) + } else { + fmt.Fprintf(bb, "%[1]vD = (*(*%v)(%[1]vI))\n", parser.CleanName(p.Name, p.Value), p.PureGoType) + } fmt.Fprint(bb, "}\n") } } From 6b046e6ee2f3468426cc247572e80c36fd071ffe Mon Sep 17 00:00:00 2001 From: StarAurryon Date: Wed, 5 Aug 2020 14:22:13 +0200 Subject: [PATCH 2/9] Fixing non unique ID on fast requests --- internal/binding/templater/function_go.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/binding/templater/function_go.go b/internal/binding/templater/function_go.go index e1afffe6c..e5572e548 100644 --- a/internal/binding/templater/function_go.go +++ b/internal/binding/templater/function_go.go @@ -157,10 +157,10 @@ func goFunctionBody(function *parser.Function) string { } fmt.Fprint(bb, func() string { if function.IsMocFunction && function.SignalMode == "" { - for i, p := range function.Parameters { + for _, p := range function.Parameters { if p.PureGoType != "" && !(p.Value == "QMap" || p.Value == "QList") && !parser.IsBlackListedPureGoType(p.PureGoType) { if !parser.UseWasm() { //TODO: does wasm need "unsafe" pointer arithmetic ? - fmt.Fprintf(bb, "%vTID := (time.Now().UnixNano()+(%v*1e10))/1e9\n", parser.CleanName(p.Name, p.Value), i) + fmt.Fprintf(bb, "%vTID := rand.New(rand.NewSource(time.Now().UnixNano())).Int63()\n", parser.CleanName(p.Name, p.Value)) fmt.Fprintf(bb, "qt.RegisterTemp(unsafe.Pointer(uintptr(%[2]vTID)), unsafe.Pointer(%[1]v%[2]v))\n", func() string { if !strings.HasPrefix(p.PureGoType, "*") { @@ -423,7 +423,7 @@ func goFunctionBody(function *parser.Function) string { if function.IsMocFunction && function.PureGoOutput != "" && !(function.Output == "QMap" || function.Output == "QList") && !parser.IsBlackListedPureGoType(function.PureGoOutput) { fmt.Fprintf(bb, "oP := %v\n", fmt.Sprintf("(*(*%v)(signal))(%v)", converter.GoHeaderInputSignalFunction(function), converter.GoInputParametersForCallback(function))) if !parser.UseWasm() { //TODO: does wasm need "unsafe" pointer arithmetic ? - fmt.Fprintf(bb, "rTID := (time.Now().UnixNano()+(1*1e10))/1e9\n") + fmt.Fprintf(bb, "rTID := rand.New(rand.NewSource(time.Now().UnixNano())).Int63()\n") fmt.Fprintf(bb, "qt.RegisterTemp(unsafe.Pointer(uintptr(rTID)), unsafe.Pointer(%voP))\n", func() string { if !strings.HasPrefix(function.PureGoOutput, "*") { @@ -509,7 +509,7 @@ func goFunctionBody(function *parser.Function) string { fmt.Fprintf(bb, "oP := %v\n", fmt.Sprintf("New%vFromPointer(ptr).%v%vDefault(%v)", strings.Title(class.Name), strings.TrimSuffix(strings.Replace(strings.Title(function.Name), parser.TILDE, "Destroy", -1), "z__"), function.OverloadNumber, converter.GoInputParametersForCallback(function))) } if !parser.UseWasm() { //TODO: does wasm need "unsafe" pointer arithmetic ? - fmt.Fprintf(bb, "rTID := (time.Now().UnixNano()+(1*1e10))/1e9\n") + fmt.Fprintf(bb, "rTID := rand.New(rand.NewSource(time.Now().UnixNano())).Int63()\n") fmt.Fprintf(bb, "qt.RegisterTemp(unsafe.Pointer(uintptr(rTID)), unsafe.Pointer(%voP))\n", func() string { if !strings.HasPrefix(function.PureGoOutput, "*") { From a14d7cd10ef6ec117a276f794d8cfc2c5d797ed3 Mon Sep 17 00:00:00 2001 From: Aurryon SCHWARTZ Date: Sat, 8 Aug 2020 08:25:56 +0200 Subject: [PATCH 3/9] Update Readme.md to match the new repo location --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7c40f64ba..13e84dbc8 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ The following instructions assume that you already installed [Go](https://golang ```powershell set GO111MODULE=off -go get -v github.com/therecipe/qt/cmd/... && for /f %v in ('go env GOPATH') do %v\bin\qtsetup test && %v\bin\qtsetup -test=false +go get -v github.com/StarAurryon/qt/cmd/... && for /f %v in ('go env GOPATH') do %v\bin\qtsetup test && %v\bin\qtsetup -test=false ``` ##### macOS [(more info)](https://github.com/therecipe/qt/wiki/Installation-on-macOS) @@ -39,7 +39,7 @@ export GO111MODULE=off; xcode-select --install; go get -v github.com/therecipe/q ##### Linux [(more info)](https://github.com/therecipe/qt/wiki/Installation-on-Linux) ```bash -export GO111MODULE=off; go get -v github.com/therecipe/qt/cmd/... && $(go env GOPATH)/bin/qtsetup test && $(go env GOPATH)/bin/qtsetup -test=false +export GO111MODULE=off; go get -v github.com/StarAurryon/qt/cmd/... && $(go env GOPATH)/bin/qtsetup test && $(go env GOPATH)/bin/qtsetup -test=false ``` Resources From b65f0ffe100e5a653aa665ecc25e11ab8cf765e2 Mon Sep 17 00:00:00 2001 From: StarAurryon Date: Sat, 8 Aug 2020 09:31:13 +0200 Subject: [PATCH 4/9] Fixing repo naming --- README.md | 20 ++++----- androidextras/androidextras.go | 4 +- androidextras/androidextras_android.go | 4 +- androidextras/utils-androidextras_android.go | 2 +- bluetooth/bluetooth.go | 6 +-- charts/charts.go | 8 ++-- cmd/qtdeploy/main.go | 6 +-- cmd/qtminimal/main.go | 6 +-- cmd/qtmoc/main.go | 6 +-- cmd/qtrcc/main.go | 6 +-- cmd/qtsetup/main.go | 6 +-- core/core.cpp | 2 +- core/core.go | 2 +- datavisualization/datavisualization.go | 6 +-- dbus/dbus.go | 4 +- designer/designer.go | 8 ++-- felgo/felgo.go | 6 +-- flutter/embedder.go | 2 +- flutter/widget.go | 10 ++--- gamepad/gamepad.go | 4 +- go.mod | 2 +- gui/gui.go | 6 +-- help/help.go | 8 ++-- internal/binding/converter/body_input_cpp.go | 4 +- internal/binding/converter/body_input_go.go | 2 +- internal/binding/converter/body_output_cpp.go | 2 +- internal/binding/converter/body_output_go.go | 2 +- internal/binding/converter/enum.go | 2 +- internal/binding/converter/header.go | 2 +- internal/binding/converter/helper.go | 4 +- internal/binding/converter/input.go | 2 +- internal/binding/converter/output.go | 4 +- internal/binding/converter/type.go | 2 +- internal/binding/files/docs/5.10.0/go.mod | 2 +- internal/binding/files/docs/5.11.1/go.mod | 2 +- internal/binding/files/docs/5.12.0/go.mod | 2 +- internal/binding/files/docs/5.13.0/go.mod | 2 +- internal/binding/files/docs/5.6.3/go.mod | 2 +- internal/binding/files/docs/5.7.0/go.mod | 2 +- internal/binding/files/docs/5.7.1/go.mod | 2 +- internal/binding/files/docs/5.8.0/go.mod | 2 +- internal/binding/files/docs/5.9.0/go.mod | 2 +- internal/binding/files/docs/mod.go | 4 +- .../files/utils-androidextras_android.go | 2 +- internal/binding/files/utils-qml.go | 4 +- internal/binding/files/utils-runtime.go | 4 +- internal/binding/parser/class.go | 2 +- internal/binding/parser/class_fix.go | 2 +- internal/binding/parser/function.go | 2 +- internal/binding/parser/function_fix.go | 2 +- internal/binding/parser/helper.go | 4 +- internal/binding/parser/module.go | 2 +- internal/binding/parser/parser.go | 16 +++---- internal/binding/runtime/utils-runtime.go | 4 +- internal/binding/templater/enum_cpp.go | 2 +- internal/binding/templater/enum_go.go | 4 +- internal/binding/templater/function_cpp.go | 6 +-- internal/binding/templater/function_go.go | 6 +-- internal/binding/templater/helper.go | 4 +- internal/binding/templater/template_c.go | 4 +- internal/binding/templater/template_cgo.go | 4 +- .../binding/templater/template_cgo_qmake.go | 6 +-- internal/binding/templater/template_cpp.go | 8 ++-- internal/binding/templater/template_dart.go | 2 +- internal/binding/templater/template_go.go | 22 +++++----- internal/binding/templater/template_h.go | 4 +- internal/binding/templater/template_haxe.go | 4 +- internal/binding/templater/template_swift.go | 2 +- internal/binding/templater/templater.go | 4 +- internal/ci/darwin.sh | 4 +- internal/ci/linux.sh | 2 +- internal/cmd/cmd.go | 12 +++--- internal/cmd/deploy/assets.go | 4 +- internal/cmd/deploy/assets_not_sailfish.go | 2 +- internal/cmd/deploy/assets_sailfish.go | 2 +- internal/cmd/deploy/build.go | 4 +- internal/cmd/deploy/build_test.go | 2 +- internal/cmd/deploy/bundle.go | 14 +++---- internal/cmd/deploy/deploy.go | 14 +++---- internal/cmd/deploy/flutter.go | 2 +- internal/cmd/deploy/run.go | 2 +- internal/cmd/minimal/minimal.go | 14 +++---- internal/cmd/moc/moc.go | 10 ++--- internal/cmd/moc/test/qtmoc_imports.go | 2 +- internal/cmd/moc/test/qtmoc_test.go | 18 ++++---- internal/cmd/moc/test/sub/b/b.go | 4 +- internal/cmd/moc/test/sub/bgo/bgo.go | 2 +- internal/cmd/moc/test/sub/c/c.go | 4 +- internal/cmd/moc/test/sub/cgo/cgo.go | 2 +- internal/cmd/moc/test/sub/d/d.go | 4 +- internal/cmd/moc/test/sub/dgo/dgo.go | 2 +- internal/cmd/moc/test/sub/sub.go | 16 +++---- internal/cmd/moc/test/sub/subb.go | 6 +-- internal/cmd/moc/test/sub/subsub/subsub.go | 4 +- internal/cmd/rcc/rcc.go | 10 ++--- internal/cmd/setup/check.go | 4 +- internal/cmd/setup/generate.go | 12 +++--- internal/cmd/setup/install.go | 10 ++--- internal/cmd/setup/prep.go | 4 +- internal/cmd/setup/test.go | 18 ++++---- internal/cmd/setup/update.go | 14 +++---- internal/cmd/tools.go | 2 +- internal/cmd/utils.go | 24 +++++------ internal/cmd/utils_msvc.go | 2 +- internal/docker/android/Dockerfile | 8 ++-- internal/docker/darwin/Dockerfile | 4 +- internal/docker/darwin/Dockerfile.512 | 4 +- internal/docker/darwin/Dockerfile.static | 4 +- internal/docker/docker_darwin_ci_template.yml | 4 +- internal/docker/docker_linux_ci_template.yml | 4 +- internal/docker/docker_showcase_template.yml | 2 +- .../docker/docker_windows_ci_template.yml | 4 +- internal/docker/js/Dockerfile.js | 6 +-- internal/docker/js/Dockerfile.js_thread | 6 +-- internal/docker/js/Dockerfile.wasm | 4 +- internal/docker/js/Dockerfile.wasm_thread | 4 +- internal/docker/linux/Dockerfile | 8 ++-- internal/docker/linux/Dockerfile.512 | 8 ++-- internal/docker/linux/Dockerfile.56 | 8 ++-- internal/docker/linux/Dockerfile.59 | 8 ++-- internal/docker/linux/Dockerfile.arch | 6 +-- internal/docker/linux/Dockerfile.debian_10 | 6 +-- .../docker/linux/Dockerfile.debian_10_arm64 | 6 +-- .../docker/linux/Dockerfile.debian_10_armv6 | 6 +-- .../docker/linux/Dockerfile.debian_10_armv7 | 6 +-- internal/docker/linux/Dockerfile.debian_9 | 6 +-- .../docker/linux/Dockerfile.debian_9_arm64 | 6 +-- .../docker/linux/Dockerfile.debian_9_armv6 | 6 +-- .../docker/linux/Dockerfile.debian_9_armv7 | 6 +-- internal/docker/linux/Dockerfile.fedora | 6 +-- internal/docker/linux/Dockerfile.fedora_arm64 | 6 +-- internal/docker/linux/Dockerfile.fedora_armv7 | 6 +-- internal/docker/linux/Dockerfile.static | 6 +-- internal/docker/linux/Dockerfile.suse_leap | 6 +-- .../docker/linux/Dockerfile.suse_tumbleweed | 6 +-- internal/docker/linux/Dockerfile.ubuntu_16_04 | 6 +-- .../linux/Dockerfile.ubuntu_16_04_arm64 | 6 +-- .../linux/Dockerfile.ubuntu_16_04_armv7 | 6 +-- internal/docker/linux/Dockerfile.ubuntu_18_04 | 6 +-- .../linux/Dockerfile.ubuntu_18_04_arm64 | 6 +-- .../linux/Dockerfile.ubuntu_18_04_armv7 | 6 +-- internal/docker/rpi/Dockerfile.base | 2 +- internal/docker/rpi/Dockerfile.rpi1 | 2 +- internal/docker/rpi/Dockerfile.rpi2 | 2 +- internal/docker/rpi/Dockerfile.rpi3 | 2 +- internal/docker/sailfish/Dockerfile | 8 ++-- internal/docker/ubports/Dockerfile.64_vivid | 4 +- internal/docker/ubports/Dockerfile.64_xenial | 4 +- internal/docker/ubports/Dockerfile.arm_vivid | 4 +- internal/docker/ubports/Dockerfile.arm_xenial | 4 +- internal/docker/windows_32_shared/Dockerfile | 4 +- internal/docker/windows_32_static/Dockerfile | 4 +- internal/docker/windows_64_shared/Dockerfile | 4 +- internal/docker/windows_64_static/Dockerfile | 4 +- .../windows_legacy/Dockerfile.32_shared | 4 +- .../windows_legacy/Dockerfile.32_static | 4 +- .../windows_legacy/Dockerfile.64_shared | 4 +- .../windows_legacy/Dockerfile.64_static | 4 +- internal/docker/wine/Dockerfile | 4 +- internal/docker/wine/Dockerfile.32 | 4 +- internal/docker/wine/Dockerfile.32_shared | 4 +- internal/docker/wine/Dockerfile.32_static | 4 +- internal/docker/wine/Dockerfile.512 | 4 +- internal/docker/wine/Dockerfile.56 | 4 +- internal/docker/wine/Dockerfile.56_xp | 4 +- internal/docker/wine/Dockerfile.59 | 4 +- internal/docker/wine/Dockerfile.64_msvc | 4 +- internal/docker/wine/Dockerfile.64_shared | 4 +- internal/docker/wine/Dockerfile.64_static | 4 +- internal/docker/wine/Dockerfile.base | 4 +- internal/docker/wine/Dockerfile.base_xp | 4 +- internal/examples/3rdparty/fluid/demo/main.go | 8 ++-- .../3rdparty/kirigami/demo/demo/main.go | 8 ++-- .../cmd/printslides/printslides.go | 4 +- .../printslides/cmd/printslides/slideview.go | 8 ++-- .../3rdparty/qml-material/demo/main.go | 10 ++--- .../quickflux/demo/middleware/main.go | 8 ++-- .../quickflux/demo/photoalbum/main.go | 8 ++-- .../3rdparty/quickflux/demo/todo/main.go | 8 ++-- internal/examples/3rdparty/quickflux/init.go | 4 +- .../qzxing/demo/BarcodeEncoder/main.go | 8 ++-- .../qzxing/demo/QZXingLive/application.go | 6 +-- .../3rdparty/qzxing/demo/QZXingLive/main.go | 6 +-- internal/examples/3rdparty/qzxing/qzxing.go | 4 +- internal/examples/3rdparty/sparkle/main.go | 2 +- .../3rdparty/stratifyqml/demo/main.go | 6 +-- .../3rdparty/uglobalhotkey/demo/main.go | 4 +- .../3rdparty/uglobalhotkey/patch/ugh.go | 6 +-- .../3rdparty/uglobalhotkey/patch/ugh_cgo.go | 2 +- internal/examples/3rdparty/winsparkle/main.go | 2 +- internal/examples/androidextras/jni/jni.go | 2 +- .../examples/androidextras/jni/runnable.go | 4 +- .../androidextras/notification/main.go | 6 +-- .../notification/notificationclient.go | 4 +- .../examples/androidextras/service/main.go | 4 +- .../bluetooth/picturetransfer/filetransfer.go | 4 +- .../bluetooth/picturetransfer/main.go | 6 +-- internal/examples/bluetooth/pingpong/main.go | 6 +-- .../examples/bluetooth/pingpong/pingpong.go | 4 +- .../examples/bluetooth/scanner/qmlscanner.go | 6 +-- .../examples/canvas3d/framebuffer/main.go | 6 +-- .../examples/canvas3d/interaction/main.go | 6 +-- internal/examples/canvas3d/jsonmodels/main.go | 6 +-- .../canvas3d/quickitemtexture/main.go | 6 +-- .../canvas3d/quickitemtexture_wear/main.go | 6 +-- .../examples/canvas3d/textureandlight/main.go | 6 +-- .../canvas3d/threejs/cellphone/main.go | 6 +-- .../examples/canvas3d/threejs/oneqt/main.go | 6 +-- .../examples/canvas3d/threejs/planets/main.go | 6 +-- internal/examples/charts/audio/main.go | 2 +- internal/examples/charts/audio/widget.go | 8 ++-- .../examples/charts/audio/xyseriesiodevice.go | 4 +- .../examples/charts/dynamicspline/chart.go | 6 +-- .../examples/charts/dynamicspline/main.go | 6 +-- .../charts/modeldata/customtablemodel.go | 4 +- internal/examples/charts/modeldata/main.go | 2 +- .../examples/charts/modeldata/tablewidget.go | 8 ++-- .../examples/common/qml_demo/inputWidgets.go | 2 +- .../examples/common/qml_demo/itemViews.go | 4 +- internal/examples/common/qml_demo/main.go | 6 +-- .../examples/common/widgets_demo/buttons.go | 4 +- .../common/widgets_demo/containers.go | 4 +- .../common/widgets_demo/displayWidgets.go | 8 ++-- .../common/widgets_demo/inputWidgets.go | 6 +-- .../examples/common/widgets_demo/itemViews.go | 6 +-- .../common/widgets_demo/itemWidgets.go | 2 +- .../examples/common/widgets_demo/layouts.go | 4 +- internal/examples/common/widgets_demo/main.go | 8 ++-- .../examples/felgo/appdemos/basicapp/main.go | 8 ++-- .../cpp-backend-charts-qml/cppdatamodel.go | 2 +- .../cpp-backend-charts-qml/filereader.go | 2 +- .../appdemos/cpp-backend-charts-qml/main.go | 8 ++-- .../appdemos/cpp-qml-integration/main.go | 8 ++-- .../cpp-qml-integration/myglobalobject.go | 2 +- .../appdemos/cpp-qml-integration/myqmltype.go | 2 +- internal/examples/felgo/appdemos/maps/main.go | 8 ++-- .../examples/felgo/appdemos/messaging/main.go | 8 ++-- .../felgo/appdemos/propertycross/main.go | 8 ++-- .../felgo/appdemos/qt-rest-client/main.go | 8 ++-- .../felgo/appdemos/qtws/cpp/cachereply.go | 4 +- .../qtws/cpp/cachingnetworkaccessmanager.go | 4 +- .../appdemos/qtws/cpp/diskcachefactory.go | 6 +-- internal/examples/felgo/appdemos/qtws/main.go | 12 +++--- .../examples/felgo/appdemos/showcase/main.go | 12 +++--- .../examples/felgo/appdemos/twitter/main.go | 8 ++-- .../examples/felgo/appdemos/weather/main.go | 8 ++-- .../felgo/appdemos/youtube-player/main.go | 8 ++-- internal/examples/felgo/demos/2048/main.go | 8 ++-- .../examples/felgo/demos/BalloonPop/main.go | 8 ++-- .../examples/felgo/demos/CarChallenge/main.go | 8 ++-- .../felgo/demos/ChickenOutbreak/main.go | 8 ++-- .../felgo/demos/CrazyCarousel/main.go | 8 ++-- .../examples/felgo/demos/DoodleJump/main.go | 8 ++-- .../felgo/playground/AppPlayground/main.go | 8 ++-- .../felgo/playground/GamePlayground/main.go | 8 ++-- internal/examples/go.mod | 2 +- .../examples/grpc/hello_world/hello_world.go | 6 +-- .../grpc/hello_world2/hello_world2.go | 6 +-- internal/examples/gui/advancedclock/main.go | 6 +-- .../examples/gui/analogclock/analogclock.go | 4 +- .../examples/gui/analogclock/rasterwindow.go | 4 +- internal/examples/gui/openglwindow/js.go | 2 +- internal/examples/gui/openglwindow/main.go | 2 +- .../examples/gui/openglwindow/openglwindow.go | 4 +- internal/examples/gui/rasterwindow/main.go | 2 +- .../examples/gui/rasterwindow/rasterwindow.go | 4 +- .../examples/opengl/2dpainting/glwidget.go | 4 +- internal/examples/opengl/2dpainting/helper.go | 4 +- internal/examples/opengl/2dpainting/main.go | 4 +- internal/examples/opengl/2dpainting/widget.go | 4 +- internal/examples/opengl/2dpainting/window.go | 4 +- internal/examples/plugins/go/main.go | 8 ++-- internal/examples/plugins/go/plugin/plugin.go | 6 +-- internal/examples/plugins/mixed/main.go | 8 ++-- .../examples/plugins/mixed/plugin/plugin.go | 6 +-- internal/examples/plugins/qml/main.go | 8 ++-- internal/examples/qml/adding/main.go | 4 +- internal/examples/qml/adding/person.go | 2 +- .../examples/qml/application/application.go | 6 +-- internal/examples/qml/custom_scheme/main.go | 10 ++--- internal/examples/qml/custom_scheme/reply.go | 4 +- .../qml/drawer_nav_x/applicationui.go | 2 +- internal/examples/qml/drawer_nav_x/main.go | 8 ++-- .../qml/extending/chapter1-basics/main.go | 6 +-- .../qml/extending/chapter1-basics/piechart.go | 6 +-- .../qml/extending/chapter2-methods/main.go | 6 +-- .../extending/chapter2-methods/piechart.go | 6 +-- .../qml/extending/chapter3-bindings/main.go | 6 +-- .../extending/chapter3-bindings/piechart.go | 6 +-- .../chapter4-customPropertyTypes/main.go | 6 +-- .../chapter4-customPropertyTypes/piechart.go | 2 +- .../chapter4-customPropertyTypes/pieslice.go | 6 +-- .../components/test_dir/component/piechart.go | 6 +-- .../qml/extending/components/test_dir/main.go | 8 ++-- .../test_dir_2/component/piechart.go | 6 +-- .../extending/components/test_dir_2/main.go | 8 ++-- .../components/test_go/component/piechart.go | 6 +-- .../qml/extending/components/test_go/main.go | 8 ++-- .../test_module/component/piechart.go | 6 +-- .../extending/components/test_module/main.go | 8 ++-- .../test_module_2/component/piechart.go | 6 +-- .../components/test_module_2/main.go | 8 ++-- .../qml/extending/components/test_qml/main.go | 8 ++-- .../test_qml_go/component/piechart.go | 6 +-- .../extending/components/test_qml_go/main.go | 8 ++-- internal/examples/qml/gallery/gallery.go | 8 ++-- internal/examples/qml/gocv/gocv.go | 6 +-- internal/examples/qml/gocv/main.go | 6 +-- internal/examples/qml/material/material.go | 6 +-- internal/examples/qml/prop/prop.go | 4 +- internal/examples/qml/prop2/prop2.go | 6 +-- internal/examples/qml/webview/webview.go | 8 ++-- .../qt3d/audio-visualizer-qml/main.go | 6 +-- .../audio-visualizer-qml/touchsettings.go | 4 +- internal/examples/quick/bridge/bridge.go | 6 +-- internal/examples/quick/bridge2/bridge2.go | 6 +-- internal/examples/quick/calc/calc.go | 6 +-- internal/examples/quick/cookies/cookies.go | 10 ++--- internal/examples/quick/dialog/dialog.go | 6 +-- internal/examples/quick/dynamic/dynamic.go | 8 ++-- internal/examples/quick/errors/main.go | 8 ++-- .../examples/quick/hotreload/hotreload.go | 6 +-- internal/examples/quick/listview/main.go | 6 +-- .../examples/quick/listview/personmodel.go | 2 +- internal/examples/quick/photoviewer/main.go | 6 +-- internal/examples/quick/sailfish/sailfish.go | 8 ++-- .../examples/quick/tableview/tableview.go | 6 +-- .../examples/quick/translate/translate.go | 6 +-- internal/examples/quick/view/view.go | 6 +-- internal/examples/sailfish/listview/main.go | 6 +-- .../examples/sailfish/listview/personmodel.go | 2 +- .../sailfish/listview_variant/main.go | 6 +-- .../sailfish/listview_variant/personmodel.go | 2 +- internal/examples/sensors/accelbubble/main.go | 8 ++-- .../showcases/wallet/controller/controller.go | 2 +- .../examples/showcases/wallet/depgraph.sh | 2 +- .../showcases/wallet/files/actionButton.go | 4 +- .../examples/showcases/wallet/files/button.go | 4 +- .../wallet/files/controller/actionButton.go | 4 +- .../wallet/files/controller/button.go | 4 +- .../wallet/files/controller/files.go | 4 +- .../wallet/files/dialog/controller/dialog.go | 6 +-- .../showcases/wallet/files/dialog/dialog.go | 6 +-- .../showcases/wallet/files/dialog/files.go | 4 +- .../showcases/wallet/files/dialog/folder.go | 4 +- .../examples/showcases/wallet/files/files.go | 8 ++-- .../showcases/wallet/files/model/files.go | 2 +- internal/examples/showcases/wallet/main.go | 42 +++++++++---------- .../wallet/terminal/controller/terminal.go | 6 +-- .../showcases/wallet/terminal/terminal.go | 4 +- .../wallet/theme/controller/colorPicker.go | 6 +-- .../wallet/theme/controller/theme.go | 2 +- .../examples/showcases/wallet/theme/theme.go | 4 +- .../showcases/wallet/view/controller/stack.go | 2 +- .../showcases/wallet/view/controller/view.go | 2 +- .../showcases/wallet/view/left/button.go | 4 +- .../wallet/view/left/controller/button.go | 4 +- .../wallet/view/left/controller/left.go | 2 +- .../wallet/view/left/controller/logo.go | 4 +- .../view/left/controller/progressBar.go | 6 +-- .../showcases/wallet/view/left/left.go | 4 +- .../showcases/wallet/view/left/logo.go | 4 +- .../showcases/wallet/view/left/progressBar.go | 4 +- .../examples/showcases/wallet/view/stack.go | 4 +- .../showcases/wallet/view/top/color.go | 4 +- .../wallet/view/top/controller/color.go | 4 +- .../wallet/view/top/controller/lock.go | 6 +-- .../wallet/view/top/controller/search.go | 6 +-- .../wallet/view/top/controller/status.go | 4 +- .../wallet/view/top/controller/top.go | 2 +- .../showcases/wallet/view/top/lock.go | 4 +- .../showcases/wallet/view/top/search.go | 4 +- .../showcases/wallet/view/top/status.go | 4 +- .../examples/showcases/wallet/view/top/top.go | 2 +- .../examples/showcases/wallet/view/view.go | 4 +- .../showcases/wallet/wallet/button.go | 4 +- .../wallet/wallet/controller/button.go | 4 +- .../wallet/wallet/controller/wallet.go | 6 +-- .../wallet/wallet/dialog/controller/dialog.go | 6 +-- .../showcases/wallet/wallet/dialog/dialog.go | 4 +- .../showcases/wallet/wallet/dialog/receive.go | 2 +- .../showcases/wallet/wallet/dialog/recover.go | 4 +- .../showcases/wallet/wallet/dialog/send.go | 4 +- .../showcases/wallet/wallet/dialog/unlock.go | 4 +- .../showcases/wallet/wallet/model/wallet.go | 2 +- .../showcases/wallet/wallet/wallet.go | 6 +-- .../examples/sql/masterdetail/database.go | 4 +- internal/examples/sql/masterdetail/dialog.go | 8 ++-- internal/examples/sql/masterdetail/main.go | 4 +- .../examples/sql/masterdetail/mainWindow.go | 10 ++--- .../masterdetail_qml/controller/controller.go | 8 ++-- .../examples/sql/masterdetail_qml/main.go | 8 ++-- .../examples/sql/masterdetail_qml/main_qml.go | 10 ++--- .../sql/masterdetail_qml/model/listmodel.go | 2 +- .../sql/masterdetail_qml/model/sortmodel.go | 2 +- .../sql/masterdetail_qml/model/viewmodel.go | 2 +- .../sql/masterdetail_qml/view/album/album.go | 6 +-- .../masterdetail_qml/view/album/album_qml.go | 6 +-- .../masterdetail_qml/view/artist/artist.go | 6 +-- .../view/artist/artist_qml.go | 6 +-- .../masterdetail_qml/view/detail/detail.go | 8 ++-- .../view/detail/detail_qml.go | 4 +- .../sql/masterdetail_qml/view/dialog/add.go | 6 +-- .../masterdetail_qml/view/dialog/add_qml.go | 4 +- .../masterdetail_qml/view/dialog/delete.go | 6 +-- .../view/dialog/delete_qml.go | 4 +- .../sql/masterdetail_qml/view/menubar.go | 4 +- .../sql/masterdetail_qml/view/view.go | 12 +++--- .../sql/masterdetail_qml/view/view_qml.go | 12 +++--- .../examples/sql/querymodel/connection.go | 4 +- .../examples/sql/querymodel/customsqlmodel.go | 6 +-- .../sql/querymodel/editablesqlmodel.go | 4 +- internal/examples/sql/querymodel/main.go | 6 +-- internal/examples/ubports/view/view.go | 4 +- internal/examples/ubports/view/view_vivid.go | 2 +- internal/examples/ubports/view/view_xenial.go | 2 +- .../examples/uitools/calculator/calculator.go | 4 +- .../uitools/calculator_manual/calculator.go | 6 +-- internal/examples/virtualkeyboard/qml/main.go | 8 ++-- .../examples/virtualkeyboard/widgets/main.go | 2 +- .../virtualkeyboard/widgets_embedded/main.go | 10 ++--- .../webchannel/chatserver-go/chatserver.go | 2 +- .../examples/webchannel/chatserver-go/main.go | 10 ++--- .../shared/websocketclientwrapper.go | 4 +- .../webchannel/shared/websockettransport.go | 6 +-- .../examples/webchannel/standalone/main.go | 18 ++++---- internal/examples/webchannel/webview/main.go | 18 ++++---- internal/examples/webkit/browser/main.go | 8 ++-- internal/examples/widgets/bridge2/bridge2.go | 6 +-- .../examples/widgets/dropsite/dropsite.go | 6 +-- .../widgets/graphicsscene/graphicsscene.go | 4 +- .../examples/widgets/line_edits/line_edits.go | 6 +-- .../widgets/pixel_editor/pixel_editor.go | 6 +-- .../examples/widgets/renderer/renderer.go | 8 ++-- internal/examples/widgets/service/main.go | 6 +-- internal/examples/widgets/share/main.go | 6 +-- internal/examples/widgets/share/shareutils.go | 6 +-- internal/examples/widgets/systray/systray.go | 2 +- internal/examples/widgets/table/table.go | 6 +-- internal/examples/widgets/textedit/main.go | 4 +- .../examples/widgets/textedit/textedit.go | 8 ++-- .../treeview/treeview_dual/treeview_dual.go | 6 +-- .../treeview_filelist/treeview_filelist.go | 4 +- .../widgets/video_player/video_player.go | 6 +-- .../examples/widgets/webengine/webengine.go | 6 +-- internal/examples/widgets/xkcd/main.go | 6 +-- internal/utils/env.go | 2 +- internal/utils/gopath.go | 2 +- internal/vagrant/freebsd/freebsd.sh | 2 +- internal/vagrant/pre.bat | 2 +- internal/vagrant/pre.sh | 2 +- interop/dart/dart.go | 2 +- interop/haxe/haxe.go | 2 +- interop/interop.go | 4 +- interop/interop_api.go | 2 +- interop/interop_api_helper.go | 2 +- interop/pseudo.go | 2 +- interop/pseudo_engine.go | 4 +- interop/pseudo_value.go | 4 +- interop/swift/swift.go | 2 +- location/location.go | 6 +-- macextras/macextras.go | 6 +-- multimedia/multimedia.go | 10 ++--- network/network.go | 4 +- nfc/nfc.go | 4 +- positioning/positioning.go | 4 +- printsupport/printsupport.go | 8 ++-- purchasing/purchasing.go | 4 +- qml/qml.go | 6 +-- qml/utils-qml.go | 4 +- quick/quick.go | 10 ++--- quickcontrols2/quickcontrols2.go | 4 +- remoteobjects/remoteobjects.go | 4 +- sailfish/sailfish.go | 8 ++-- sailfish/sailfish_sailfish.go | 8 ++-- script/script.go | 4 +- scripttools/scripttools.go | 8 ++-- scxml/scxml.go | 4 +- sensors/sensors.go | 4 +- serialbus/serialbus.go | 6 +-- serialport/serialport.go | 4 +- speech/speech.go | 4 +- sql/sql.go | 8 ++-- svg/svg.go | 8 ++-- testlib/testlib.go | 6 +-- uitools/uitools.go | 6 +-- virtualkeyboard/virtualkeyboard.go | 4 +- webchannel/webchannel.go | 4 +- webengine/webengine.go | 14 +++---- webkit/webkit.go | 12 +++--- websockets/websockets.go | 6 +-- webview/webview.go | 4 +- widgets/widgets.go | 6 +-- xml/xml.go | 4 +- xmlpatterns/xmlpatterns.go | 6 +-- 495 files changed, 1348 insertions(+), 1348 deletions(-) diff --git a/README.md b/README.md index 13e84dbc8..85b23e418 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Introduction [Go](https://en.wikipedia.org/wiki/Go_(programming_language)), also known as Golang, is a programming language designed at Google. -[therecipe/qt](https://github.com/therecipe/qt) allows you to write Qt applications entirely in Go or JavaScript. +[therecipe/qt](https://github.com/StarAurryon/qt) allows you to write Qt applications entirely in Go or JavaScript. Beside the language bindings provided, `therecipe/qt` also greatly simplifies the deployment of Qt applications to various software and hardware platforms. @@ -14,7 +14,7 @@ At the time of writing, almost all Qt functions and classes are accessible from Impressions ----------- -[Gallery](https://github.com/therecipe/qt/wiki/Gallery) of example applications. +[Gallery](https://github.com/StarAurryon/qt/wiki/Gallery) of example applications. [JavaScript Demo](https://therecipe.github.io/entry) | *[source](https://github.com/therecipe/entry)* @@ -23,20 +23,20 @@ Installation The following instructions assume that you already installed [Go](https://golang.org/dl/) and [Git](https://git-scm.com/downloads) -##### Windows [(more info)](https://github.com/therecipe/qt/wiki/Installation-on-Windows) +##### Windows [(more info)](https://github.com/StarAurryon/qt/wiki/Installation-on-Windows) ```powershell set GO111MODULE=off go get -v github.com/StarAurryon/qt/cmd/... && for /f %v in ('go env GOPATH') do %v\bin\qtsetup test && %v\bin\qtsetup -test=false ``` -##### macOS [(more info)](https://github.com/therecipe/qt/wiki/Installation-on-macOS) +##### macOS [(more info)](https://github.com/StarAurryon/qt/wiki/Installation-on-macOS) ```bash -export GO111MODULE=off; xcode-select --install; go get -v github.com/therecipe/qt/cmd/... && $(go env GOPATH)/bin/qtsetup test && $(go env GOPATH)/bin/qtsetup -test=false +export GO111MODULE=off; xcode-select --install; go get -v github.com/StarAurryon/qt/cmd/... && $(go env GOPATH)/bin/qtsetup test && $(go env GOPATH)/bin/qtsetup -test=false ``` -##### Linux [(more info)](https://github.com/therecipe/qt/wiki/Installation-on-Linux) +##### Linux [(more info)](https://github.com/StarAurryon/qt/wiki/Installation-on-Linux) ```bash export GO111MODULE=off; go get -v github.com/StarAurryon/qt/cmd/... && $(go env GOPATH)/bin/qtsetup test && $(go env GOPATH)/bin/qtsetup -test=false @@ -45,11 +45,11 @@ export GO111MODULE=off; go get -v github.com/StarAurryon/qt/cmd/... && $(go env Resources --------- -- [Installation](https://github.com/therecipe/qt/wiki/Installation) -- [Getting Started](https://github.com/therecipe/qt/wiki/Getting-Started) -- [Wiki](https://github.com/therecipe/qt/wiki) +- [Installation](https://github.com/StarAurryon/qt/wiki/Installation) +- [Getting Started](https://github.com/StarAurryon/qt/wiki/Getting-Started) +- [Wiki](https://github.com/StarAurryon/qt/wiki) - [Qt Documentation](https://doc.qt.io/qt-5/classes.html) -- [FAQ](https://github.com/therecipe/qt/wiki/FAQ) +- [FAQ](https://github.com/StarAurryon/qt/wiki/FAQ) - [#qt-binding](https://gophers.slack.com/messages/qt-binding/details) Slack channel ([invite](https://invite.slack.golangbridge.org)\) Deployment Targets diff --git a/androidextras/androidextras.go b/androidextras/androidextras.go index 6772221f2..2297be803 100644 --- a/androidextras/androidextras.go +++ b/androidextras/androidextras.go @@ -3,8 +3,8 @@ package androidextras import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" "strings" "unsafe" ) diff --git a/androidextras/androidextras_android.go b/androidextras/androidextras_android.go index 2e9e177cf..a8a3fe09b 100644 --- a/androidextras/androidextras_android.go +++ b/androidextras/androidextras_android.go @@ -9,8 +9,8 @@ package androidextras import "C" import ( "errors" - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" "strings" "unsafe" ) diff --git a/androidextras/utils-androidextras_android.go b/androidextras/utils-androidextras_android.go index e47deb3d3..f8997edc6 100644 --- a/androidextras/utils-androidextras_android.go +++ b/androidextras/utils-androidextras_android.go @@ -5,7 +5,7 @@ import ( "strings" "unsafe" - "github.com/therecipe/qt" + "github.com/StarAurryon/qt" ) func assertion(key int, input ...interface{}) (unsafe.Pointer, func()) { diff --git a/bluetooth/bluetooth.go b/bluetooth/bluetooth.go index 5ba1079f5..04cf08ffb 100644 --- a/bluetooth/bluetooth.go +++ b/bluetooth/bluetooth.go @@ -8,9 +8,9 @@ package bluetooth //#include "bluetooth.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/network" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/network" "reflect" "strings" "unsafe" diff --git a/charts/charts.go b/charts/charts.go index 6a5586e7e..cc1a4f528 100644 --- a/charts/charts.go +++ b/charts/charts.go @@ -8,10 +8,10 @@ package charts //#include "charts.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/widgets" "strings" "unsafe" ) diff --git a/cmd/qtdeploy/main.go b/cmd/qtdeploy/main.go index 94a99f0dc..be8d9d2fd 100644 --- a/cmd/qtdeploy/main.go +++ b/cmd/qtdeploy/main.go @@ -9,10 +9,10 @@ import ( "runtime" "strings" - "github.com/therecipe/qt/internal/cmd" - "github.com/therecipe/qt/internal/cmd/deploy" + "github.com/StarAurryon/qt/internal/cmd" + "github.com/StarAurryon/qt/internal/cmd/deploy" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) func main() { diff --git a/cmd/qtminimal/main.go b/cmd/qtminimal/main.go index c5f3f5209..27e15414e 100644 --- a/cmd/qtminimal/main.go +++ b/cmd/qtminimal/main.go @@ -8,10 +8,10 @@ import ( "runtime" "strings" - "github.com/therecipe/qt/internal/cmd" - "github.com/therecipe/qt/internal/cmd/minimal" + "github.com/StarAurryon/qt/internal/cmd" + "github.com/StarAurryon/qt/internal/cmd/minimal" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) func main() { diff --git a/cmd/qtmoc/main.go b/cmd/qtmoc/main.go index 33ed0b662..179c14d22 100644 --- a/cmd/qtmoc/main.go +++ b/cmd/qtmoc/main.go @@ -8,10 +8,10 @@ import ( "runtime" "strings" - "github.com/therecipe/qt/internal/cmd" - "github.com/therecipe/qt/internal/cmd/moc" + "github.com/StarAurryon/qt/internal/cmd" + "github.com/StarAurryon/qt/internal/cmd/moc" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) func main() { diff --git a/cmd/qtrcc/main.go b/cmd/qtrcc/main.go index 1cd5e3422..6f7223eb9 100644 --- a/cmd/qtrcc/main.go +++ b/cmd/qtrcc/main.go @@ -8,10 +8,10 @@ import ( "runtime" "strings" - "github.com/therecipe/qt/internal/cmd" - "github.com/therecipe/qt/internal/cmd/rcc" + "github.com/StarAurryon/qt/internal/cmd" + "github.com/StarAurryon/qt/internal/cmd/rcc" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) func main() { diff --git a/cmd/qtsetup/main.go b/cmd/qtsetup/main.go index 9c92d80ca..d332f3da8 100644 --- a/cmd/qtsetup/main.go +++ b/cmd/qtsetup/main.go @@ -7,10 +7,10 @@ import ( "runtime" "strings" - "github.com/therecipe/qt/internal/cmd" - "github.com/therecipe/qt/internal/cmd/setup" + "github.com/StarAurryon/qt/internal/cmd" + "github.com/StarAurryon/qt/internal/cmd/setup" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) func main() { diff --git a/core/core.cpp b/core/core.cpp index 20bfa8c61..e20d41037 100644 --- a/core/core.cpp +++ b/core/core.cpp @@ -9,7 +9,7 @@ #ifndef QT_CORE_LIB #error ------------------------------------------------------------------ #error please run: '$(go env GOPATH)/bin/qtsetup' - #error more info here: https://github.com/therecipe/qt/wiki/Installation + #error more info here: https://github.com/StarAurryon/qt/wiki/Installation #error ------------------------------------------------------------------ #endif #include diff --git a/core/core.go b/core/core.go index c94efcf13..877e99b38 100644 --- a/core/core.go +++ b/core/core.go @@ -8,7 +8,7 @@ package core //#include "core.h" import "C" import ( - "github.com/therecipe/qt" + "github.com/StarAurryon/qt" "math" "reflect" "runtime" diff --git a/datavisualization/datavisualization.go b/datavisualization/datavisualization.go index 0ebafa4b7..ca8f5c7a8 100644 --- a/datavisualization/datavisualization.go +++ b/datavisualization/datavisualization.go @@ -8,9 +8,9 @@ package datavisualization //#include "datavisualization.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" "strings" "unsafe" ) diff --git a/dbus/dbus.go b/dbus/dbus.go index ba0c82805..7d4ac4578 100644 --- a/dbus/dbus.go +++ b/dbus/dbus.go @@ -8,8 +8,8 @@ package dbus //#include "dbus.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" "strings" "unsafe" ) diff --git a/designer/designer.go b/designer/designer.go index aba10f257..c6c159f1b 100644 --- a/designer/designer.go +++ b/designer/designer.go @@ -8,10 +8,10 @@ package designer //#include "designer.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/widgets" "strings" "unsafe" ) diff --git a/felgo/felgo.go b/felgo/felgo.go index fc0fa08e0..cbd60dedb 100644 --- a/felgo/felgo.go +++ b/felgo/felgo.go @@ -8,9 +8,9 @@ package felgo //#include "felgo.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/qml" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/qml" "runtime" "strings" "unsafe" diff --git a/flutter/embedder.go b/flutter/embedder.go index 632c7f442..5f4b7c600 100644 --- a/flutter/embedder.go +++ b/flutter/embedder.go @@ -48,7 +48,7 @@ import ( "time" "unsafe" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt/core" ) func FlutterEngineRun() { diff --git a/flutter/widget.go b/flutter/widget.go index cba051444..8f3648999 100644 --- a/flutter/widget.go +++ b/flutter/widget.go @@ -11,12 +11,12 @@ import ( "time" "unsafe" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/widgets" - "github.com/therecipe/qt/interop" - _ "github.com/therecipe/qt/interop/dart" + "github.com/StarAurryon/qt/interop" + _ "github.com/StarAurryon/qt/interop/dart" ) var ( diff --git a/gamepad/gamepad.go b/gamepad/gamepad.go index 67a6ff2b1..dfdd9f690 100644 --- a/gamepad/gamepad.go +++ b/gamepad/gamepad.go @@ -8,8 +8,8 @@ package gamepad //#include "gamepad.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" "strings" "unsafe" ) diff --git a/go.mod b/go.mod index fa25889fd..d3e30e5e1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/therecipe/qt +module github.com/StarAurryon/qt require ( github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e diff --git a/gui/gui.go b/gui/gui.go index 15b05a4b8..071dff448 100644 --- a/gui/gui.go +++ b/gui/gui.go @@ -8,9 +8,9 @@ package gui //#include "gui.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - _ "github.com/therecipe/qt/internal/binding/runtime" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + _ "github.com/StarAurryon/qt/internal/binding/runtime" "strings" "unsafe" ) diff --git a/help/help.go b/help/help.go index c134385b8..a2f5b9fc8 100644 --- a/help/help.go +++ b/help/help.go @@ -8,10 +8,10 @@ package help //#include "help.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/widgets" "strings" "unsafe" ) diff --git a/internal/binding/converter/body_input_cpp.go b/internal/binding/converter/body_input_cpp.go index 825ce2198..de443ae9a 100644 --- a/internal/binding/converter/body_input_cpp.go +++ b/internal/binding/converter/body_input_cpp.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "github.com/therecipe/qt/internal/binding/parser" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/utils" ) func CppInputParameters(function *parser.Function) string { diff --git a/internal/binding/converter/body_input_go.go b/internal/binding/converter/body_input_go.go index 8aa9c5978..bf2814698 100644 --- a/internal/binding/converter/body_input_go.go +++ b/internal/binding/converter/body_input_go.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/therecipe/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/binding/parser" ) func GoInputParametersForC(function *parser.Function) string { diff --git a/internal/binding/converter/body_output_cpp.go b/internal/binding/converter/body_output_cpp.go index 633b8da5c..49f6e2cd0 100644 --- a/internal/binding/converter/body_output_cpp.go +++ b/internal/binding/converter/body_output_cpp.go @@ -3,7 +3,7 @@ package converter import ( "fmt" - "github.com/therecipe/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/binding/parser" ) func CppOutputParameters(function *parser.Function, name string) string { diff --git a/internal/binding/converter/body_output_go.go b/internal/binding/converter/body_output_go.go index 6c5164702..aada6da22 100644 --- a/internal/binding/converter/body_output_go.go +++ b/internal/binding/converter/body_output_go.go @@ -1,6 +1,6 @@ package converter -import "github.com/therecipe/qt/internal/binding/parser" +import "github.com/StarAurryon/qt/internal/binding/parser" func GoOutputParametersFromC(function *parser.Function, name string) string { if function.Meta == parser.CONSTRUCTOR { diff --git a/internal/binding/converter/enum.go b/internal/binding/converter/enum.go index 2ac06ec39..d36d94a66 100644 --- a/internal/binding/converter/enum.go +++ b/internal/binding/converter/enum.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/therecipe/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/binding/parser" ) func EnumNeedsCppGlue(value string) bool { diff --git a/internal/binding/converter/header.go b/internal/binding/converter/header.go index ce286a369..0f9d19a3c 100644 --- a/internal/binding/converter/header.go +++ b/internal/binding/converter/header.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/therecipe/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/binding/parser" ) func GoHeaderName(f *parser.Function) string { diff --git a/internal/binding/converter/helper.go b/internal/binding/converter/helper.go index 6f4806646..b8342db91 100644 --- a/internal/binding/converter/helper.go +++ b/internal/binding/converter/helper.go @@ -9,8 +9,8 @@ import ( "strings" "sync" - "github.com/therecipe/qt/internal/binding/parser" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/utils" ) func module(input interface{}) string { diff --git a/internal/binding/converter/input.go b/internal/binding/converter/input.go index 153a3b944..55c0da6b5 100644 --- a/internal/binding/converter/input.go +++ b/internal/binding/converter/input.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/therecipe/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/binding/parser" ) func GoInput(name, value string, f *parser.Function, p string) string { diff --git a/internal/binding/converter/output.go b/internal/binding/converter/output.go index d8a482032..f0398c0b1 100644 --- a/internal/binding/converter/output.go +++ b/internal/binding/converter/output.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "github.com/therecipe/qt/internal/binding/parser" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/utils" ) func GoOutput(name, value string, f *parser.Function, p string) string { diff --git a/internal/binding/converter/type.go b/internal/binding/converter/type.go index 6ddbf3701..e9e04cc75 100644 --- a/internal/binding/converter/type.go +++ b/internal/binding/converter/type.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/therecipe/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/binding/parser" ) func GoType(f *parser.Function, value string, p string) string { return goType(f, value, p) } diff --git a/internal/binding/files/docs/5.10.0/go.mod b/internal/binding/files/docs/5.10.0/go.mod index ddd22893d..35b90e128 100644 --- a/internal/binding/files/docs/5.10.0/go.mod +++ b/internal/binding/files/docs/5.10.0/go.mod @@ -1 +1 @@ -module github.com/therecipe/qt/internal/binding/files/docs/5.10.0 +module github.com/StarAurryon/qt/internal/binding/files/docs/5.10.0 diff --git a/internal/binding/files/docs/5.11.1/go.mod b/internal/binding/files/docs/5.11.1/go.mod index 4a332fbc1..f7bcd7a8a 100644 --- a/internal/binding/files/docs/5.11.1/go.mod +++ b/internal/binding/files/docs/5.11.1/go.mod @@ -1 +1 @@ -module github.com/therecipe/qt/internal/binding/files/docs/5.11.1 +module github.com/StarAurryon/qt/internal/binding/files/docs/5.11.1 diff --git a/internal/binding/files/docs/5.12.0/go.mod b/internal/binding/files/docs/5.12.0/go.mod index 4e29ba227..4caa2b112 100644 --- a/internal/binding/files/docs/5.12.0/go.mod +++ b/internal/binding/files/docs/5.12.0/go.mod @@ -1 +1 @@ -module github.com/therecipe/qt/internal/binding/files/docs/5.12.0 +module github.com/StarAurryon/qt/internal/binding/files/docs/5.12.0 diff --git a/internal/binding/files/docs/5.13.0/go.mod b/internal/binding/files/docs/5.13.0/go.mod index 77ec476ee..c390fc22e 100644 --- a/internal/binding/files/docs/5.13.0/go.mod +++ b/internal/binding/files/docs/5.13.0/go.mod @@ -1 +1 @@ -module github.com/therecipe/qt/internal/binding/files/docs/5.13.0 +module github.com/StarAurryon/qt/internal/binding/files/docs/5.13.0 diff --git a/internal/binding/files/docs/5.6.3/go.mod b/internal/binding/files/docs/5.6.3/go.mod index e50d6a5f6..151a48c55 100644 --- a/internal/binding/files/docs/5.6.3/go.mod +++ b/internal/binding/files/docs/5.6.3/go.mod @@ -1 +1 @@ -module github.com/therecipe/qt/internal/binding/files/docs/5.6.3 +module github.com/StarAurryon/qt/internal/binding/files/docs/5.6.3 diff --git a/internal/binding/files/docs/5.7.0/go.mod b/internal/binding/files/docs/5.7.0/go.mod index 24e4e897e..66fe47005 100644 --- a/internal/binding/files/docs/5.7.0/go.mod +++ b/internal/binding/files/docs/5.7.0/go.mod @@ -1 +1 @@ -module github.com/therecipe/qt/internal/binding/files/docs/5.7.0 +module github.com/StarAurryon/qt/internal/binding/files/docs/5.7.0 diff --git a/internal/binding/files/docs/5.7.1/go.mod b/internal/binding/files/docs/5.7.1/go.mod index 9c6876192..9b71f37dc 100644 --- a/internal/binding/files/docs/5.7.1/go.mod +++ b/internal/binding/files/docs/5.7.1/go.mod @@ -1 +1 @@ -module github.com/therecipe/qt/internal/binding/files/docs/5.7.1 +module github.com/StarAurryon/qt/internal/binding/files/docs/5.7.1 diff --git a/internal/binding/files/docs/5.8.0/go.mod b/internal/binding/files/docs/5.8.0/go.mod index 71eb7483c..ff8f99aae 100644 --- a/internal/binding/files/docs/5.8.0/go.mod +++ b/internal/binding/files/docs/5.8.0/go.mod @@ -1 +1 @@ -module github.com/therecipe/qt/internal/binding/files/docs/5.8.0 +module github.com/StarAurryon/qt/internal/binding/files/docs/5.8.0 diff --git a/internal/binding/files/docs/5.9.0/go.mod b/internal/binding/files/docs/5.9.0/go.mod index 6677c5aa6..02e1aa03c 100644 --- a/internal/binding/files/docs/5.9.0/go.mod +++ b/internal/binding/files/docs/5.9.0/go.mod @@ -1 +1 @@ -module github.com/therecipe/qt/internal/binding/files/docs/5.9.0 +module github.com/StarAurryon/qt/internal/binding/files/docs/5.9.0 diff --git a/internal/binding/files/docs/mod.go b/internal/binding/files/docs/mod.go index e974c449a..1feb38d09 100644 --- a/internal/binding/files/docs/mod.go +++ b/internal/binding/files/docs/mod.go @@ -1,6 +1,6 @@ package docs import ( - _ "github.com/therecipe/qt/internal/binding/files/docs/5.12.0" - _ "github.com/therecipe/qt/internal/binding/files/docs/5.13.0" + _ "github.com/StarAurryon/qt/internal/binding/files/docs/5.12.0" + _ "github.com/StarAurryon/qt/internal/binding/files/docs/5.13.0" ) diff --git a/internal/binding/files/utils-androidextras_android.go b/internal/binding/files/utils-androidextras_android.go index e47deb3d3..f8997edc6 100644 --- a/internal/binding/files/utils-androidextras_android.go +++ b/internal/binding/files/utils-androidextras_android.go @@ -5,7 +5,7 @@ import ( "strings" "unsafe" - "github.com/therecipe/qt" + "github.com/StarAurryon/qt" ) func assertion(key int, input ...interface{}) (unsafe.Pointer, func()) { diff --git a/internal/binding/files/utils-qml.go b/internal/binding/files/utils-qml.go index 936b818ee..a9136deb8 100644 --- a/internal/binding/files/utils-qml.go +++ b/internal/binding/files/utils-qml.go @@ -10,8 +10,8 @@ import ( "sync" "unsafe" - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" ) var ( diff --git a/internal/binding/files/utils-runtime.go b/internal/binding/files/utils-runtime.go index b86667fe9..c0fa1735a 100644 --- a/internal/binding/files/utils-runtime.go +++ b/internal/binding/files/utils-runtime.go @@ -1,8 +1,8 @@ package runtime import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/qml" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/qml" ) func init() { diff --git a/internal/binding/parser/class.go b/internal/binding/parser/class.go index e483e33bc..2722a633b 100644 --- a/internal/binding/parser/class.go +++ b/internal/binding/parser/class.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) type Class struct { diff --git a/internal/binding/parser/class_fix.go b/internal/binding/parser/class_fix.go index ba32539c5..13a5e7846 100644 --- a/internal/binding/parser/class_fix.go +++ b/internal/binding/parser/class_fix.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) func (c *Class) fix() { diff --git a/internal/binding/parser/function.go b/internal/binding/parser/function.go index 053350261..48d9382f1 100644 --- a/internal/binding/parser/function.go +++ b/internal/binding/parser/function.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) type Function struct { diff --git a/internal/binding/parser/function_fix.go b/internal/binding/parser/function_fix.go index bc9ac37f7..1cc9a307f 100644 --- a/internal/binding/parser/function_fix.go +++ b/internal/binding/parser/function_fix.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) func (f *Function) fix() { diff --git a/internal/binding/parser/helper.go b/internal/binding/parser/helper.go index a63a7beca..5a9506364 100644 --- a/internal/binding/parser/helper.go +++ b/internal/binding/parser/helper.go @@ -9,8 +9,8 @@ import ( "strings" "sync" - "github.com/therecipe/qt/internal/cmd" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/cmd" + "github.com/StarAurryon/qt/internal/utils" ) const ( diff --git a/internal/binding/parser/module.go b/internal/binding/parser/module.go index 166e3e6bb..a90d3427e 100644 --- a/internal/binding/parser/module.go +++ b/internal/binding/parser/module.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) type Module struct { diff --git a/internal/binding/parser/parser.go b/internal/binding/parser/parser.go index 91d0f2e81..94e229ae6 100644 --- a/internal/binding/parser/parser.go +++ b/internal/binding/parser/parser.go @@ -9,7 +9,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) var State = &struct { @@ -106,10 +106,10 @@ func LoadModule(m string) *Module { var err error switch { 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) + err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/StarAurryon/qt/internal/binding/files/docs/5.8.0", "-find", "get doc dir")), fmt.Sprintf("qt%v.index", strings.ToLower(m))))), &module) case utils.QT_FELGO() && m == "Felgo": - err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/therecipe/qt/internal/binding/files/docs/5.12.0", "-find", "get doc dir")), fmt.Sprintf("qt%v.index", strings.ToLower(m))))), &module) + err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/StarAurryon/qt/internal/binding/files/docs/5.12.0", "-find", "get doc dir")), fmt.Sprintf("qt%v.index", strings.ToLower(m))))), &module) case utils.QT_MXE(), utils.QT_HOMEBREW(), @@ -118,22 +118,22 @@ func LoadModule(m string) *Module { 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) + err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/StarAurryon/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("") != "" { - 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) + err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/StarAurryon/qt/internal/binding/files/docs/"+utils.QT_API(utils.QT_VERSION()), "-find", "get doc dir")), fmt.Sprintf("qt%v.index", strings.ToLower(m))))), &module) } else { err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(utils.QT_DOC_DIR(), fmt.Sprintf("qt%v", strings.ToLower(m)), fmt.Sprintf("qt%v.index", strings.ToLower(m))))), &module) if err != nil { utils.Log.WithFields(logFields).Debug("falling back to bundled *.index files") - 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) + err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/StarAurryon/qt/internal/binding/files/docs/"+utils.QT_API("5.13.0"), "-find", "get doc dir")), fmt.Sprintf("qt%v.index", strings.ToLower(m))))), &module) } } default: if utils.QT_API("") != "" { - 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) + err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/StarAurryon/qt/internal/binding/files/docs/"+utils.QT_API(utils.QT_VERSION()), "-find", "get doc dir")), fmt.Sprintf("qt%v.index", strings.ToLower(m))))), &module) } else { path := filepath.Join(utils.QT_DIR(), "Docs", fmt.Sprintf("Qt-%v", utils.QT_VERSION_MAJOR()), fmt.Sprintf("qt%v", strings.ToLower(m)), fmt.Sprintf("qt%v.index", strings.ToLower(m))) if !utils.ExistsDir(filepath.Join(utils.QT_DIR(), "Docs", fmt.Sprintf("Qt-%v", utils.QT_VERSION_MAJOR()))) { @@ -142,7 +142,7 @@ func LoadModule(m string) *Module { err = xml.Unmarshal([]byte(utils.LoadOptional(path)), &module) if err != nil { utils.Log.WithFields(logFields).Debug("falling back to bundled *.index files") - 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) + err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/StarAurryon/qt/internal/binding/files/docs/"+utils.QT_API(utils.QT_VERSION()), "-find", "get doc dir")), fmt.Sprintf("qt%v.index", strings.ToLower(m))))), &module) } } } diff --git a/internal/binding/runtime/utils-runtime.go b/internal/binding/runtime/utils-runtime.go index b86667fe9..c0fa1735a 100644 --- a/internal/binding/runtime/utils-runtime.go +++ b/internal/binding/runtime/utils-runtime.go @@ -1,8 +1,8 @@ package runtime import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/qml" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/qml" ) func init() { diff --git a/internal/binding/templater/enum_cpp.go b/internal/binding/templater/enum_cpp.go index b69f9191d..726a7eb9a 100644 --- a/internal/binding/templater/enum_cpp.go +++ b/internal/binding/templater/enum_cpp.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/therecipe/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/binding/parser" ) func cppEnum(e *parser.Enum, v *parser.Value) string { diff --git a/internal/binding/templater/enum_go.go b/internal/binding/templater/enum_go.go index 518b1c57b..5ca86fabe 100644 --- a/internal/binding/templater/enum_go.go +++ b/internal/binding/templater/enum_go.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/therecipe/qt/internal/binding/converter" - "github.com/therecipe/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/binding/converter" + "github.com/StarAurryon/qt/internal/binding/parser" ) func goEnum(e *parser.Enum, _ *parser.Value) string { diff --git a/internal/binding/templater/function_cpp.go b/internal/binding/templater/function_cpp.go index 599c8afbe..c33e08d70 100644 --- a/internal/binding/templater/function_cpp.go +++ b/internal/binding/templater/function_cpp.go @@ -7,9 +7,9 @@ import ( "fmt" "strings" - "github.com/therecipe/qt/internal/binding/converter" - "github.com/therecipe/qt/internal/binding/parser" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/binding/converter" + "github.com/StarAurryon/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/utils" ) func cppFunctionCallback(function *parser.Function) string { diff --git a/internal/binding/templater/function_go.go b/internal/binding/templater/function_go.go index e5572e548..a15e7495c 100644 --- a/internal/binding/templater/function_go.go +++ b/internal/binding/templater/function_go.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/therecipe/qt/internal/binding/converter" - "github.com/therecipe/qt/internal/binding/parser" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/binding/converter" + "github.com/StarAurryon/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/utils" ) func goFunction(function *parser.Function) string { diff --git a/internal/binding/templater/helper.go b/internal/binding/templater/helper.go index 614305ebe..c412cf494 100644 --- a/internal/binding/templater/helper.go +++ b/internal/binding/templater/helper.go @@ -3,8 +3,8 @@ package templater import ( "strings" - "github.com/therecipe/qt/internal/binding/parser" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/utils" ) func hasUnimplementedPureVirtualFunctions(className string) bool { diff --git a/internal/binding/templater/template_c.go b/internal/binding/templater/template_c.go index c33a4da3d..9c5251fcf 100644 --- a/internal/binding/templater/template_c.go +++ b/internal/binding/templater/template_c.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" - "github.com/therecipe/qt/internal/binding/converter" - "github.com/therecipe/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/binding/converter" + "github.com/StarAurryon/qt/internal/binding/parser" ) func cTemplate(bb *bytes.Buffer, c *parser.Class, ef func(*parser.Enum, *parser.Value) string, ff func(*parser.Function) string, del string, isGo bool) { diff --git a/internal/binding/templater/template_cgo.go b/internal/binding/templater/template_cgo.go index fac2d2249..2db09cace 100644 --- a/internal/binding/templater/template_cgo.go +++ b/internal/binding/templater/template_cgo.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/therecipe/qt/internal/binding/parser" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/utils" ) func cleanLibs(module string, mode int) []string { diff --git a/internal/binding/templater/template_cgo_qmake.go b/internal/binding/templater/template_cgo_qmake.go index c90b00526..ea54340fb 100644 --- a/internal/binding/templater/template_cgo_qmake.go +++ b/internal/binding/templater/template_cgo_qmake.go @@ -10,9 +10,9 @@ import ( "runtime" "strings" - "github.com/therecipe/qt/internal/binding/parser" - "github.com/therecipe/qt/internal/cmd" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/cmd" + "github.com/StarAurryon/qt/internal/utils" ) const ( diff --git a/internal/binding/templater/template_cpp.go b/internal/binding/templater/template_cpp.go index 9e24a8f48..6b5f4c816 100644 --- a/internal/binding/templater/template_cpp.go +++ b/internal/binding/templater/template_cpp.go @@ -12,9 +12,9 @@ import ( "strings" "time" - "github.com/therecipe/qt/internal/binding/converter" - "github.com/therecipe/qt/internal/binding/parser" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/binding/converter" + "github.com/StarAurryon/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/utils" ) var exportedFunctions []string @@ -661,7 +661,7 @@ extern "C" int32_t __isPlatformVersionAtLeast(int32_t Platform, int32_t Major, i #ifndef QT_CORE_LIB #error ------------------------------------------------------------------ #error please run: '$(go env GOPATH)/bin/qtsetup' - #error more info here: https://github.com/therecipe/qt/wiki/Installation + #error more info here: https://github.com/StarAurryon/qt/wiki/Installation #error ------------------------------------------------------------------ #endif` } diff --git a/internal/binding/templater/template_dart.go b/internal/binding/templater/template_dart.go index 3f707a815..f7015d1a2 100644 --- a/internal/binding/templater/template_dart.go +++ b/internal/binding/templater/template_dart.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/therecipe/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/binding/parser" ) func convertToDart(className string, l string, convertClassMethods bool) string { diff --git a/internal/binding/templater/template_go.go b/internal/binding/templater/template_go.go index e3fc3070e..cf157c4e2 100644 --- a/internal/binding/templater/template_go.go +++ b/internal/binding/templater/template_go.go @@ -7,18 +7,18 @@ import ( "path/filepath" "strings" - "github.com/therecipe/qt/internal/binding/converter" - "github.com/therecipe/qt/internal/binding/parser" - "github.com/therecipe/qt/internal/cmd" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/binding/converter" + "github.com/StarAurryon/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/cmd" + "github.com/StarAurryon/qt/internal/utils" ) func GoTemplate(module string, stub bool, mode int, pkg, target, tags string) []byte { if module == "AndroidExtras" { - utils.Save(utils.GoQtPkgPath(strings.ToLower(module), "utils-androidextras_android.go"), utils.Load(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/therecipe/qt/internal", "-find", "get files dir")), "/binding/files/utils-androidextras_android.go"))) + utils.Save(utils.GoQtPkgPath(strings.ToLower(module), "utils-androidextras_android.go"), utils.Load(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/StarAurryon/qt/internal", "-find", "get files dir")), "/binding/files/utils-androidextras_android.go"))) } else if module == "Qml" { - cont := utils.Load(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/therecipe/qt/internal", "-find", "get files dir")), "/binding/files/utils-qml.go")) + cont := utils.Load(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/StarAurryon/qt/internal", "-find", "get files dir")), "/binding/files/utils-qml.go")) if utils.QT_API_NUM(utils.QT_VERSION()) < 5060 { cont = strings.Replace(cont, "Property2(", "Property3(", -1) } @@ -1418,7 +1418,7 @@ import "C" fmt.Fprintln(bb, "\"encoding/hex\"") case "qt": - fmt.Fprintln(bb, "\"github.com/therecipe/qt\"") + fmt.Fprintln(bb, "\"github.com/StarAurryon/qt\"") case "js": if parser.UseWasm() { @@ -1429,9 +1429,9 @@ import "C" default: if mode == MOC { - fmt.Fprintf(bb, "std_%[1]v \"github.com/therecipe/qt/%[1]v\"\n", mlow) + fmt.Fprintf(bb, "std_%[1]v \"github.com/StarAurryon/qt/%[1]v\"\n", mlow) } else { - fmt.Fprintf(bb, "\"github.com/therecipe/qt/%v\"\n", mlow) + fmt.Fprintf(bb, "\"github.com/StarAurryon/qt/%v\"\n", mlow) } if utils.QT_GEN_TSD() { @@ -1502,9 +1502,9 @@ import "C" if module == "gui" && utils.QT_API_NUM(utils.QT_VERSION()) >= 5050 { if mode == NONE { - fmt.Fprintln(bb, "_ \"github.com/therecipe/qt/internal/binding/runtime\"") + fmt.Fprintln(bb, "_ \"github.com/StarAurryon/qt/internal/binding/runtime\"") } else if mode == MINIMAL && (cmd.ImportsQmlOrQuick() || cmd.ImportsInterop()) { - fmt.Fprintln(bb, "_ \"github.com/therecipe/qt/internal/binding/runtime\"") + fmt.Fprintln(bb, "_ \"github.com/StarAurryon/qt/internal/binding/runtime\"") } } } diff --git a/internal/binding/templater/template_h.go b/internal/binding/templater/template_h.go index c9c26b764..46be0e6ac 100644 --- a/internal/binding/templater/template_h.go +++ b/internal/binding/templater/template_h.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/therecipe/qt/internal/binding/parser" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/utils" ) func HTemplate(m string, mode int, tags string) []byte { diff --git a/internal/binding/templater/template_haxe.go b/internal/binding/templater/template_haxe.go index 1f5003be7..a395386f7 100644 --- a/internal/binding/templater/template_haxe.go +++ b/internal/binding/templater/template_haxe.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/therecipe/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/binding/parser" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) func convertToHaxe(className string, l string, convertClassMethods bool) string { diff --git a/internal/binding/templater/template_swift.go b/internal/binding/templater/template_swift.go index 7679bbafa..d6f100da0 100644 --- a/internal/binding/templater/template_swift.go +++ b/internal/binding/templater/template_swift.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/therecipe/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/binding/parser" ) func convertToSwift(className string, l string, convertClassMethods bool) string { diff --git a/internal/binding/templater/templater.go b/internal/binding/templater/templater.go index f8ef1326b..de82b6ed7 100644 --- a/internal/binding/templater/templater.go +++ b/internal/binding/templater/templater.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "github.com/therecipe/qt/internal/binding/parser" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/utils" ) func GenModule(m, target string, mode int) { diff --git a/internal/ci/darwin.sh b/internal/ci/darwin.sh index 15cce6a65..a82b12f30 100755 --- a/internal/ci/darwin.sh +++ b/internal/ci/darwin.sh @@ -23,9 +23,9 @@ else QT=qt-unified-mac-x64-3.0.5-online if [ "$IOS" == "true" ] || [ "$IOS_SIMULATOR" == "true" ] then - /Volumes/$QT/$QT.app/Contents/MacOS/$QT -v --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs IOS=true + /Volumes/$QT/$QT.app/Contents/MacOS/$QT -v --script $GOPATH/src/github.com/StarAurryon/qt/internal/ci/iscript.qs IOS=true else - /Volumes/$QT/$QT.app/Contents/MacOS/$QT -v --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs DARWIN=true + /Volumes/$QT/$QT.app/Contents/MacOS/$QT -v --script $GOPATH/src/github.com/StarAurryon/qt/internal/ci/iscript.qs DARWIN=true fi diskutil unmountDisk disk1 rm -f /tmp/$QT.dmg diff --git a/internal/ci/linux.sh b/internal/ci/linux.sh index 064113c52..1f0729cf9 100755 --- a/internal/ci/linux.sh +++ b/internal/ci/linux.sh @@ -24,7 +24,7 @@ else QT=qt-unified-linux-x64-online.run curl -sL --retry 10 --retry-delay 10 -o /tmp/$QT https://download.qt.io/official_releases/online_installers/$QT chmod +x /tmp/$QT - /tmp/$QT -v --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true + /tmp/$QT -v --script $GOPATH/src/github.com/StarAurryon/qt/internal/ci/iscript.qs LINUX=true rm -f /tmp/$QT fi diff --git a/internal/cmd/cmd.go b/internal/cmd/cmd.go index 5dcbd7359..9be7be429 100644 --- a/internal/cmd/cmd.go +++ b/internal/cmd/cmd.go @@ -14,7 +14,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) var buildVersion = "no build version" @@ -51,13 +51,13 @@ func ParseFlags() bool { _, err := exec.LookPath("go") 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") == "" { + if utils.GoListOptional("{{.Dir}}", "github.com/StarAurryon/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 if !utils.UseGOMOD("") { - if o := utils.GoListOptional("{{join .Imports \"|\"}}", "github.com/therecipe/qt/internal/binding/files/docs", "get doc dir"); o != "" { + if o := utils.GoListOptional("{{join .Imports \"|\"}}", "github.com/StarAurryon/qt/internal/binding/files/docs", "get doc dir"); o != "" { for _, v := range strings.Split(o, "|") { - fmt.Println(strings.TrimPrefix(strings.TrimSpace(strings.Replace(v, "'", "", -1)), "github.com/therecipe/qt/internal/binding/files/docs/")) + fmt.Println(strings.TrimPrefix(strings.TrimSpace(strings.Replace(v, "'", "", -1)), "github.com/StarAurryon/qt/internal/binding/files/docs/")) } } } else { @@ -67,7 +67,7 @@ func ParseFlags() bool { wg.Add(1) go func(mid, min int) { v := fmt.Sprintf("5.%v.%v", mid, min) - if utils.GoListOptional("{{.Dir}}", "github.com/therecipe/qt/internal/binding/files/docs/"+v, "-find", "get doc dir") != "" { + if utils.GoListOptional("{{.Dir}}", "github.com/StarAurryon/qt/internal/binding/files/docs/"+v, "-find", "get doc dir") != "" { fmt.Println(v) } wg.Done() @@ -390,7 +390,7 @@ func virtual(arg []string, target, path string, writeCacheToHost bool, docker bo gpath += pathseperator + gpfs args = append(args, []string{"-e", "QT_STUB=true"}...) //TODO: won't work with wine images atm } else { - if strings.Contains(path, "github.com/therecipe/qt/internal/examples") && !strings.Contains(path, "github.com/therecipe/qt/internal/examples/androidextras") { + if strings.Contains(path, "github.com/StarAurryon/qt/internal/examples") && !strings.Contains(path, "github.com/StarAurryon/qt/internal/examples/androidextras") { gpath += pathseperator + gpfs } else { gpath = gpfs + pathseperator + gpath diff --git a/internal/cmd/deploy/assets.go b/internal/cmd/deploy/assets.go index 07ff5287e..99a50b748 100644 --- a/internal/cmd/deploy/assets.go +++ b/internal/cmd/deploy/assets.go @@ -10,8 +10,8 @@ import ( "runtime" "strings" - "github.com/therecipe/qt/internal/cmd/rcc" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/cmd/rcc" + "github.com/StarAurryon/qt/internal/utils" ) //linux diff --git a/internal/cmd/deploy/assets_not_sailfish.go b/internal/cmd/deploy/assets_not_sailfish.go index fb4f73ae9..2120eb8c8 100644 --- a/internal/cmd/deploy/assets_not_sailfish.go +++ b/internal/cmd/deploy/assets_not_sailfish.go @@ -5,5 +5,5 @@ package deploy import "errors" func sailfish_ssh(port, login string, cmd ...string) error { - return errors.New("please run \"go install -v -tags=sailfish github.com/therecipe/qt/cmd/...\" to enable sailfish deployments") + return errors.New("please run \"go install -v -tags=sailfish github.com/StarAurryon/qt/cmd/...\" to enable sailfish deployments") } diff --git a/internal/cmd/deploy/assets_sailfish.go b/internal/cmd/deploy/assets_sailfish.go index 10a0963de..9a1c2016a 100644 --- a/internal/cmd/deploy/assets_sailfish.go +++ b/internal/cmd/deploy/assets_sailfish.go @@ -10,7 +10,7 @@ import ( "golang.org/x/crypto/ssh" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) func sailfish_ssh(port, login string, cmd ...string) error { diff --git a/internal/cmd/deploy/build.go b/internal/cmd/deploy/build.go index 12e520904..805bef07f 100644 --- a/internal/cmd/deploy/build.go +++ b/internal/cmd/deploy/build.go @@ -13,8 +13,8 @@ import ( "github.com/sirupsen/logrus" - "github.com/therecipe/qt/internal/cmd" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/cmd" + "github.com/StarAurryon/qt/internal/utils" ) func build(mode, target, path, ldFlagsCustom, tagsCustom, name, depPath string, fast, comply bool) { diff --git a/internal/cmd/deploy/build_test.go b/internal/cmd/deploy/build_test.go index 9f7b1f6bd..7bb99b789 100644 --- a/internal/cmd/deploy/build_test.go +++ b/internal/cmd/deploy/build_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) func Test_escapeFlags(t *testing.T) { diff --git a/internal/cmd/deploy/bundle.go b/internal/cmd/deploy/bundle.go index 5e27c8b65..7c1707d8b 100644 --- a/internal/cmd/deploy/bundle.go +++ b/internal/cmd/deploy/bundle.go @@ -11,13 +11,13 @@ import ( "strings" "time" - "github.com/therecipe/qt/internal/binding/parser" - "github.com/therecipe/qt/internal/binding/templater" + "github.com/StarAurryon/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/binding/templater" - "github.com/therecipe/qt/internal/cmd" - "github.com/therecipe/qt/internal/cmd/moc" - "github.com/therecipe/qt/internal/cmd/rcc" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/cmd" + "github.com/StarAurryon/qt/internal/cmd/moc" + "github.com/StarAurryon/qt/internal/cmd/rcc" + "github.com/StarAurryon/qt/internal/utils" ) func bundle(mode, target, path, name, depPath string, tagsCustom string, fast bool) { @@ -943,7 +943,7 @@ func bundle(mode, target, path, name, depPath string, tagsCustom string, fast bo } for _, l := range strings.Split(strings.TrimSpace(utils.RunCmd(lcmd, "go list deps")), "|") { for _, ml := range parser.GetLibs() { - if strings.HasSuffix(strings.ToLower(l), "github.com/therecipe/qt/"+strings.ToLower(ml)) { + if strings.HasSuffix(strings.ToLower(l), "github.com/StarAurryon/qt/"+strings.ToLower(ml)) { cmd.Args = append(cmd.Args, utils.GoQtPkgPath(strings.ToLower(ml), strings.ToLower(ml)+"-minimal.cpp")) break } diff --git a/internal/cmd/deploy/deploy.go b/internal/cmd/deploy/deploy.go index 7643577b9..ddc8ca7d0 100644 --- a/internal/cmd/deploy/deploy.go +++ b/internal/cmd/deploy/deploy.go @@ -7,14 +7,14 @@ import ( "runtime" "strings" - "github.com/therecipe/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/binding/parser" - "github.com/therecipe/qt/internal/cmd" - "github.com/therecipe/qt/internal/cmd/minimal" - "github.com/therecipe/qt/internal/cmd/moc" - "github.com/therecipe/qt/internal/cmd/rcc" + "github.com/StarAurryon/qt/internal/cmd" + "github.com/StarAurryon/qt/internal/cmd/minimal" + "github.com/StarAurryon/qt/internal/cmd/moc" + "github.com/StarAurryon/qt/internal/cmd/rcc" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) func Deploy(mode, target, path string, docker bool, ldFlags, tags string, fast bool, device string, vagrant bool, vagrantsystem string, comply bool, useuic bool, quickcompiler bool) { @@ -51,7 +51,7 @@ 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.QtModVersion(filepath.Dir(utils.GOMOD(path)))) //TODO: needs to pull 5.8.0 if QT_WEBKIT + cmd := exec.Command("go", "get", "-v", "-d", "github.com/StarAurryon/qt/internal/binding/files/docs/"+utils.QT_API(utils.QT_VERSION())+"@"+cmd.QtModVersion(filepath.Dir(utils.GOMOD(path)))) //TODO: needs to pull 5.8.0 if QT_WEBKIT cmd.Dir = path if !utils.QT_PKG_CONFIG() { utils.RunCmdOptional(cmd, "go get docs") //TODO: this can fail if QT_PKG_CONFIG diff --git a/internal/cmd/deploy/flutter.go b/internal/cmd/deploy/flutter.go index cde5f3b2a..3dd45f9c8 100644 --- a/internal/cmd/deploy/flutter.go +++ b/internal/cmd/deploy/flutter.go @@ -13,7 +13,7 @@ import ( "runtime" "strings" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) func flutter(target string, path string) { diff --git a/internal/cmd/deploy/run.go b/internal/cmd/deploy/run.go index 91dda40fc..8facc73c7 100644 --- a/internal/cmd/deploy/run.go +++ b/internal/cmd/deploy/run.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) func run(target, name, depPath, device string) { diff --git a/internal/cmd/minimal/minimal.go b/internal/cmd/minimal/minimal.go index becb3ebaf..2f71d40f0 100644 --- a/internal/cmd/minimal/minimal.go +++ b/internal/cmd/minimal/minimal.go @@ -10,14 +10,14 @@ import ( "strings" "sync" - "github.com/therecipe/qt/internal/binding/converter" - "github.com/therecipe/qt/internal/binding/parser" - "github.com/therecipe/qt/internal/binding/templater" + "github.com/StarAurryon/qt/internal/binding/converter" + "github.com/StarAurryon/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/binding/templater" - "github.com/therecipe/qt/internal/cmd" - "github.com/therecipe/qt/internal/cmd/moc" + "github.com/StarAurryon/qt/internal/cmd" + "github.com/StarAurryon/qt/internal/cmd/moc" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) func Minimal(path, target, tags string, skipSetup bool) { @@ -50,7 +50,7 @@ func Minimal(path, target, tags string, skipSetup 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.QtModVersion(filepath.Dir(utils.GOMOD(path)))) //TODO: needs to pull 5.8.0 if QT_WEBKIT + cmd := exec.Command("go", "get", "-v", "-d", "github.com/StarAurryon/qt/internal/binding/files/docs/"+utils.QT_API(utils.QT_VERSION())+"@"+cmd.QtModVersion(filepath.Dir(utils.GOMOD(path)))) //TODO: needs to pull 5.8.0 if QT_WEBKIT cmd.Dir = path if !utils.QT_PKG_CONFIG() { utils.RunCmdOptional(cmd, "go get docs") //TODO: this can fail if QT_PKG_CONFIG diff --git a/internal/cmd/moc/moc.go b/internal/cmd/moc/moc.go index c57085adc..4738c45a2 100644 --- a/internal/cmd/moc/moc.go +++ b/internal/cmd/moc/moc.go @@ -18,11 +18,11 @@ import ( "golang.org/x/tools/imports" - "github.com/therecipe/qt/internal/binding/parser" - "github.com/therecipe/qt/internal/binding/templater" + "github.com/StarAurryon/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/binding/templater" - "github.com/therecipe/qt/internal/cmd" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/cmd" + "github.com/StarAurryon/qt/internal/utils" ) var ( @@ -58,7 +58,7 @@ func Moc(path, target, tags string, fast, slow, deploying bool, skipSetup 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.QtModVersion(filepath.Dir(utils.GOMOD(path)))) //TODO: needs to pull 5.8.0 if QT_WEBKIT + cmd := exec.Command("go", "get", "-v", "-d", "github.com/StarAurryon/qt/internal/binding/files/docs/"+utils.QT_API(utils.QT_VERSION())+"@"+cmd.QtModVersion(filepath.Dir(utils.GOMOD(path)))) //TODO: needs to pull 5.8.0 if QT_WEBKIT cmd.Dir = path if !utils.QT_PKG_CONFIG() { utils.RunCmdOptional(cmd, "go get docs") //TODO: this can fail if QT_PKG_CONFIG diff --git a/internal/cmd/moc/test/qtmoc_imports.go b/internal/cmd/moc/test/qtmoc_imports.go index e50a6e53e..e3e8ce6c6 100644 --- a/internal/cmd/moc/test/qtmoc_imports.go +++ b/internal/cmd/moc/test/qtmoc_imports.go @@ -1,3 +1,3 @@ package qtmoc -import _ "github.com/therecipe/qt/internal/cmd/moc/test/sub" +import _ "github.com/StarAurryon/qt/internal/cmd/moc/test/sub" diff --git a/internal/cmd/moc/test/qtmoc_test.go b/internal/cmd/moc/test/qtmoc_test.go index 8416ecb8b..2b5801345 100644 --- a/internal/cmd/moc/test/qtmoc_test.go +++ b/internal/cmd/moc/test/qtmoc_test.go @@ -9,15 +9,15 @@ import ( tps "time" "unsafe" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/sql" - "github.com/therecipe/qt/widgets" - "github.com/therecipe/qt/xml" - - "github.com/therecipe/qt/internal/cmd/moc/test/sub" - _ "github.com/therecipe/qt/internal/cmd/moc/test/sub/conf" - "github.com/therecipe/qt/internal/cmd/moc/test/sub/subsub" //subsubcustom + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/sql" + "github.com/StarAurryon/qt/widgets" + "github.com/StarAurryon/qt/xml" + + "github.com/StarAurryon/qt/internal/cmd/moc/test/sub" + _ "github.com/StarAurryon/qt/internal/cmd/moc/test/sub/conf" + "github.com/StarAurryon/qt/internal/cmd/moc/test/sub/subsub" //subsubcustom ) type Application struct { diff --git a/internal/cmd/moc/test/sub/b/b.go b/internal/cmd/moc/test/sub/b/b.go index 796f98968..b637f1ec2 100644 --- a/internal/cmd/moc/test/sub/b/b.go +++ b/internal/cmd/moc/test/sub/b/b.go @@ -1,9 +1,9 @@ package b import ( - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt/core" - _ "github.com/therecipe/qt/internal/cmd/moc/test/sub/conf" + _ "github.com/StarAurryon/qt/internal/cmd/moc/test/sub/conf" ) type StructSubGoB struct{} diff --git a/internal/cmd/moc/test/sub/bgo/bgo.go b/internal/cmd/moc/test/sub/bgo/bgo.go index c3aa78eab..73f47bdf0 100644 --- a/internal/cmd/moc/test/sub/bgo/bgo.go +++ b/internal/cmd/moc/test/sub/bgo/bgo.go @@ -1,5 +1,5 @@ package bgo -import _ "github.com/therecipe/qt/internal/cmd/moc/test/sub/conf" +import _ "github.com/StarAurryon/qt/internal/cmd/moc/test/sub/conf" type StructSubGoBGo struct{} diff --git a/internal/cmd/moc/test/sub/c/c.go b/internal/cmd/moc/test/sub/c/c.go index 38ac540b4..f2a0049ec 100644 --- a/internal/cmd/moc/test/sub/c/c.go +++ b/internal/cmd/moc/test/sub/c/c.go @@ -1,9 +1,9 @@ package c import ( - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt/core" - _ "github.com/therecipe/qt/internal/cmd/moc/test/sub/conf" + _ "github.com/StarAurryon/qt/internal/cmd/moc/test/sub/conf" ) type StructSubGoC struct{} diff --git a/internal/cmd/moc/test/sub/cgo/cgo.go b/internal/cmd/moc/test/sub/cgo/cgo.go index eb8ea4857..e757d0e38 100644 --- a/internal/cmd/moc/test/sub/cgo/cgo.go +++ b/internal/cmd/moc/test/sub/cgo/cgo.go @@ -1,5 +1,5 @@ package cgo -import _ "github.com/therecipe/qt/internal/cmd/moc/test/sub/conf" +import _ "github.com/StarAurryon/qt/internal/cmd/moc/test/sub/conf" type StructSubGoCGo struct{} diff --git a/internal/cmd/moc/test/sub/d/d.go b/internal/cmd/moc/test/sub/d/d.go index 3ace861a9..8f5855743 100644 --- a/internal/cmd/moc/test/sub/d/d.go +++ b/internal/cmd/moc/test/sub/d/d.go @@ -1,9 +1,9 @@ package d import ( - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt/core" - _ "github.com/therecipe/qt/internal/cmd/moc/test/sub/conf" + _ "github.com/StarAurryon/qt/internal/cmd/moc/test/sub/conf" ) type StructSubGoD struct{} diff --git a/internal/cmd/moc/test/sub/dgo/dgo.go b/internal/cmd/moc/test/sub/dgo/dgo.go index e0399d4fe..58980fcd3 100644 --- a/internal/cmd/moc/test/sub/dgo/dgo.go +++ b/internal/cmd/moc/test/sub/dgo/dgo.go @@ -1,5 +1,5 @@ package dgo -import _ "github.com/therecipe/qt/internal/cmd/moc/test/sub/conf" +import _ "github.com/StarAurryon/qt/internal/cmd/moc/test/sub/conf" type StructSubGoDGo struct{} diff --git a/internal/cmd/moc/test/sub/sub.go b/internal/cmd/moc/test/sub/sub.go index 88e1e2f33..e13666a86 100644 --- a/internal/cmd/moc/test/sub/sub.go +++ b/internal/cmd/moc/test/sub/sub.go @@ -1,17 +1,17 @@ package sub import ( - "github.com/therecipe/qt/internal/cmd/moc/test/sub/subsub" + "github.com/StarAurryon/qt/internal/cmd/moc/test/sub/subsub" - "github.com/therecipe/qt/internal/cmd/moc/test/sub/b" - abc "github.com/therecipe/qt/internal/cmd/moc/test/sub/c" - . "github.com/therecipe/qt/internal/cmd/moc/test/sub/d" + "github.com/StarAurryon/qt/internal/cmd/moc/test/sub/b" + abc "github.com/StarAurryon/qt/internal/cmd/moc/test/sub/c" + . "github.com/StarAurryon/qt/internal/cmd/moc/test/sub/d" - "github.com/therecipe/qt/internal/cmd/moc/test/sub/bgo" - abcgo "github.com/therecipe/qt/internal/cmd/moc/test/sub/cgo" - . "github.com/therecipe/qt/internal/cmd/moc/test/sub/dgo" + "github.com/StarAurryon/qt/internal/cmd/moc/test/sub/bgo" + abcgo "github.com/StarAurryon/qt/internal/cmd/moc/test/sub/cgo" + . "github.com/StarAurryon/qt/internal/cmd/moc/test/sub/dgo" - _ "github.com/therecipe/qt/internal/cmd/moc/test/sub/conf" + _ "github.com/StarAurryon/qt/internal/cmd/moc/test/sub/conf" ) //TODO: duplicate struct name issue diff --git a/internal/cmd/moc/test/sub/subb.go b/internal/cmd/moc/test/sub/subb.go index b96f82833..2f55b0b2b 100644 --- a/internal/cmd/moc/test/sub/subb.go +++ b/internal/cmd/moc/test/sub/subb.go @@ -1,10 +1,10 @@ package sub import ( - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt/core" - _ "github.com/therecipe/qt/internal/cmd/moc/test/sub/conf" - _ "github.com/therecipe/qt/internal/cmd/moc/test/sub/subsub" + _ "github.com/StarAurryon/qt/internal/cmd/moc/test/sub/conf" + _ "github.com/StarAurryon/qt/internal/cmd/moc/test/sub/subsub" ) var SomeType *someType diff --git a/internal/cmd/moc/test/sub/subsub/subsub.go b/internal/cmd/moc/test/sub/subsub/subsub.go index 5e399b803..57eb94af0 100644 --- a/internal/cmd/moc/test/sub/subsub/subsub.go +++ b/internal/cmd/moc/test/sub/subsub/subsub.go @@ -1,9 +1,9 @@ package subsubcustom import ( - "github.com/therecipe/qt/gui" + "github.com/StarAurryon/qt/gui" - _ "github.com/therecipe/qt/internal/cmd/moc/test/sub/conf" + _ "github.com/StarAurryon/qt/internal/cmd/moc/test/sub/conf" ) var SubSubTestStructInstance *SubSubTestStruct diff --git a/internal/cmd/rcc/rcc.go b/internal/cmd/rcc/rcc.go index e6ecc588b..f370a1c5e 100644 --- a/internal/cmd/rcc/rcc.go +++ b/internal/cmd/rcc/rcc.go @@ -12,11 +12,11 @@ import ( "strings" "sync" - "github.com/therecipe/qt/internal/binding/templater" + "github.com/StarAurryon/qt/internal/binding/templater" - "github.com/therecipe/qt/internal/cmd" + "github.com/StarAurryon/qt/internal/cmd" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) var ( @@ -32,7 +32,7 @@ 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.QtModVersion(filepath.Dir(utils.GOMOD(path)))) //TODO: needs to pull 5.8.0 if QT_WEBKIT + cmd := exec.Command("go", "get", "-v", "-d", "github.com/StarAurryon/qt/internal/binding/files/docs/"+utils.QT_API(utils.QT_VERSION())+"@"+cmd.QtModVersion(filepath.Dir(utils.GOMOD(path)))) //TODO: needs to pull 5.8.0 if QT_WEBKIT cmd.Dir = path if !utils.QT_PKG_CONFIG() { utils.RunCmdOptional(cmd, "go get docs") //TODO: this can fail if QT_PKG_CONFIG @@ -695,7 +695,7 @@ func rcc(path, target, tagsCustom, output_dir string, quickcompiler bool, useuic if i == 0 { fmt.Fprintln(bb, "\""+p+"\"") } else { - fmt.Fprintln(bb, "\"github.com/therecipe/qt/"+p+"\"") + fmt.Fprintln(bb, "\"github.com/StarAurryon/qt/"+p+"\"") } } fmt.Fprintln(bb, "\n)") diff --git a/internal/cmd/setup/check.go b/internal/cmd/setup/check.go index 94a194ca3..4e47f2a7c 100644 --- a/internal/cmd/setup/check.go +++ b/internal/cmd/setup/check.go @@ -8,7 +8,7 @@ import ( "runtime" "strings" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) func Check(target string, docker, vagrant bool) { @@ -28,7 +28,7 @@ func Check(target string, docker, vagrant bool) { hash := "please install git" if utils.UseGOMOD("") { - hash = utils.GoListOptional("{{.Version}}", "github.com/therecipe/qt", "-m", "get qt hash") + hash = utils.GoListOptional("{{.Version}}", "github.com/StarAurryon/qt", "-m", "get qt hash") } else { if _, err := exec.LookPath("git"); err == nil { cmd := exec.Command("git", "rev-parse", "--verify", "HEAD") diff --git a/internal/cmd/setup/generate.go b/internal/cmd/setup/generate.go index 703ad222e..a8555d59f 100644 --- a/internal/cmd/setup/generate.go +++ b/internal/cmd/setup/generate.go @@ -8,12 +8,12 @@ import ( "runtime" "strings" - "github.com/therecipe/qt/internal/binding/parser" - "github.com/therecipe/qt/internal/binding/templater" + "github.com/StarAurryon/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/binding/templater" - "github.com/therecipe/qt/internal/cmd" - "github.com/therecipe/qt/internal/cmd/moc" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/cmd" + "github.com/StarAurryon/qt/internal/cmd/moc" + "github.com/StarAurryon/qt/internal/utils" ) func Generate(target string, docker, vagrant bool) { @@ -71,6 +71,6 @@ func Generate(target string, docker, vagrant bool) { runtimePath := utils.GoQtPkgPath("internal/binding/runtime") utils.RemoveAll(runtimePath) utils.MkdirAll(runtimePath) - utils.Save(filepath.Join(runtimePath, "utils-runtime.go"), utils.Load(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/therecipe/qt/internal", "-find", "get files dir")), "/binding/files/utils-runtime.go"))) + utils.Save(filepath.Join(runtimePath, "utils-runtime.go"), utils.Load(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/StarAurryon/qt/internal", "-find", "get files dir")), "/binding/files/utils-runtime.go"))) moc.Moc(runtimePath, target, "", true, false, false, true) } diff --git a/internal/cmd/setup/install.go b/internal/cmd/setup/install.go index c138d32e2..e0c17281f 100644 --- a/internal/cmd/setup/install.go +++ b/internal/cmd/setup/install.go @@ -10,11 +10,11 @@ import ( "strconv" "strings" - "github.com/therecipe/qt/internal/binding/parser" - "github.com/therecipe/qt/internal/binding/templater" + "github.com/StarAurryon/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/binding/templater" - "github.com/therecipe/qt/internal/cmd" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/cmd" + "github.com/StarAurryon/qt/internal/utils" ) func Install(target string, docker, vagrant, failfast bool) { @@ -110,7 +110,7 @@ func Install(target string, docker, vagrant, failfast bool) { cmd = exec.Command(filepath.Join(utils.GOBIN(), "gopherjs"), "install") } - cmd.Args = append(cmd.Args, fmt.Sprintf("github.com/therecipe/qt/%v", strings.ToLower(module))) + cmd.Args = append(cmd.Args, fmt.Sprintf("github.com/StarAurryon/qt/%v", strings.ToLower(module))) if target == "js" { cmd.Args = append(cmd.Args, "-v") diff --git a/internal/cmd/setup/prep.go b/internal/cmd/setup/prep.go index 058a4e8b3..9bef429f6 100644 --- a/internal/cmd/setup/prep.go +++ b/internal/cmd/setup/prep.go @@ -6,8 +6,8 @@ import ( "path/filepath" "runtime" - "github.com/therecipe/qt/internal/cmd" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/cmd" + "github.com/StarAurryon/qt/internal/utils" ) func Prep(target string) { diff --git a/internal/cmd/setup/test.go b/internal/cmd/setup/test.go index 8b491095f..3c9747af2 100644 --- a/internal/cmd/setup/test.go +++ b/internal/cmd/setup/test.go @@ -8,16 +8,16 @@ import ( "runtime" "strings" - "github.com/therecipe/qt/internal/binding/parser" - "github.com/therecipe/qt/internal/binding/templater" + "github.com/StarAurryon/qt/internal/binding/parser" + "github.com/StarAurryon/qt/internal/binding/templater" - "github.com/therecipe/qt/internal/cmd" - "github.com/therecipe/qt/internal/cmd/deploy" - "github.com/therecipe/qt/internal/cmd/minimal" - "github.com/therecipe/qt/internal/cmd/moc" - "github.com/therecipe/qt/internal/cmd/rcc" + "github.com/StarAurryon/qt/internal/cmd" + "github.com/StarAurryon/qt/internal/cmd/deploy" + "github.com/StarAurryon/qt/internal/cmd/minimal" + "github.com/StarAurryon/qt/internal/cmd/moc" + "github.com/StarAurryon/qt/internal/cmd/rcc" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) func Test(target string, docker, vagrant bool, vagrantsystem string) { @@ -161,7 +161,7 @@ func Test(target string, docker, vagrant bool, vagrantsystem string) { example := filepath.Join(cat, example) - path := filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/therecipe/qt/internal/examples", "-find", "get doc dir")), example) + path := filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/StarAurryon/qt/internal/examples", "-find", "get doc dir")), example) utils.Log.Infof("testing %v", example) deploy.Deploy( mode, diff --git a/internal/cmd/setup/update.go b/internal/cmd/setup/update.go index bcf622b1d..f83ab8f20 100644 --- a/internal/cmd/setup/update.go +++ b/internal/cmd/setup/update.go @@ -7,14 +7,14 @@ import ( "runtime" "strings" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) func Update() { utils.Log.Info("running: 'qtsetup update'") - utils.RunCmd(exec.Command("go", "clean", "-i", "github.com/therecipe/qt/cmd/..."), "run \"go clean cmd\"") - utils.RunCmd(exec.Command("go", "clean", "-i", "github.com/therecipe/qt/internal/..."), "run \"go clean internal\"") + utils.RunCmd(exec.Command("go", "clean", "-i", "github.com/StarAurryon/qt/cmd/..."), "run \"go clean cmd\"") + utils.RunCmd(exec.Command("go", "clean", "-i", "github.com/StarAurryon/qt/internal/..."), "run \"go clean internal\"") fetch := exec.Command("git", "fetch", "-f", "--all") fetch.Dir = filepath.Join(utils.MustGoPath(), "src", "github.com", "therecipe", "qt") @@ -35,7 +35,7 @@ func Update() { hash = strings.TrimSpace(utils.RunCmdOptional(cmd, "get git hash")) } - utils.RunCmd(exec.Command("go", "install", "-v", fmt.Sprintf("-ldflags=\"-X=github.com/therecipe/qt/internal/cmd.buildVersion=%v\"", hash), fmt.Sprintf("github.com/therecipe/qt/cmd/...")), "run \"go install\"") + utils.RunCmd(exec.Command("go", "install", "-v", fmt.Sprintf("-ldflags=\"-X=github.com/StarAurryon/qt/internal/cmd.buildVersion=%v\"", hash), fmt.Sprintf("github.com/StarAurryon/qt/cmd/...")), "run \"go install\"") Prep(runtime.GOOS) } @@ -43,10 +43,10 @@ func Update() { func Upgrade() { utils.Log.Info("running: 'qtsetup upgrade'") - utils.RunCmd(exec.Command("go", "clean", "-i", "github.com/therecipe/qt/..."), "run \"go clean\"") + utils.RunCmd(exec.Command("go", "clean", "-i", "github.com/StarAurryon/qt/..."), "run \"go clean\"") utils.RemoveAll(utils.GoQtPkgPath()) - utils.RunCmd(exec.Command("go", "get", "-v", "-d", "github.com/therecipe/qt/cmd/..."), "run \"go get\"") + utils.RunCmd(exec.Command("go", "get", "-v", "-d", "github.com/StarAurryon/qt/cmd/..."), "run \"go get\"") hash := "please install git" if _, err := exec.LookPath("git"); err == nil { @@ -55,5 +55,5 @@ func Upgrade() { hash = strings.TrimSpace(utils.RunCmdOptional(cmd, "get git hash")) } - utils.RunCmd(exec.Command("go", "install", "-v", fmt.Sprintf("-ldflags=\"-X=github.com/therecipe/qt/internal/cmd.buildVersion=%v\"", hash), fmt.Sprintf("github.com/therecipe/qt/cmd/...")), "run \"go install\"") + utils.RunCmd(exec.Command("go", "install", "-v", fmt.Sprintf("-ldflags=\"-X=github.com/StarAurryon/qt/internal/cmd.buildVersion=%v\"", hash), fmt.Sprintf("github.com/StarAurryon/qt/cmd/...")), "run \"go install\"") } diff --git a/internal/cmd/tools.go b/internal/cmd/tools.go index 36ef377ed..a021f05c1 100644 --- a/internal/cmd/tools.go +++ b/internal/cmd/tools.go @@ -1,4 +1,4 @@ package cmd //only needed for module support -import _ "github.com/therecipe/qt/internal/binding/files/docs" +import _ "github.com/StarAurryon/qt/internal/binding/files/docs" diff --git a/internal/cmd/utils.go b/internal/cmd/utils.go index 4e8537532..2ee8e08c0 100644 --- a/internal/cmd/utils.go +++ b/internal/cmd/utils.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) var ( @@ -74,9 +74,9 @@ func GetImports(path, target, tagsCustom string, level int, onlyDirect bool) []s stdImport[c] = k c++ } - stdImport[len(stdImport)-1] = "github.com/therecipe/qt/internal/binding/runtime" + stdImport[len(stdImport)-1] = "github.com/StarAurryon/qt/internal/binding/runtime" - cmd := utils.GoList(fmt.Sprintf("{{if not .Standard}}{{if eq .ImportPath \"%v\"}}{{else}}{{range .Imports}}{{if eq . \"github.com/therecipe/qt/qml\" \"github.com/therecipe/qt/quick\"}}{{.}}{{end}}{{end}}{{end}}{{end}}", strings.Join(stdImport, "\" \"")), "-deps", utils.BuildTags(tags)) + cmd := utils.GoList(fmt.Sprintf("{{if not .Standard}}{{if eq .ImportPath \"%v\"}}{{else}}{{range .Imports}}{{if eq . \"github.com/StarAurryon/qt/qml\" \"github.com/StarAurryon/qt/quick\"}}{{.}}{{end}}{{end}}{{end}}{{end}}", strings.Join(stdImport, "\" \"")), "-deps", utils.BuildTags(tags)) if !utils.UseGOMOD(path) || (utils.UseGOMOD(path) && !strings.Contains(strings.Replace(path, "\\", "/", -1), "/vendor/")) { cmd.Dir = path } else if utils.UseGOMOD(path) && strings.Contains(strings.Replace(path, "\\", "/", -1), "/vendor/") { @@ -100,9 +100,9 @@ func GetImports(path, target, tagsCustom string, level int, onlyDirect bool) []s stdImport[c] = k c++ } - stdImport[len(stdImport)-1] = "github.com/therecipe/qt/internal/binding/runtime" + stdImport[len(stdImport)-1] = "github.com/StarAurryon/qt/internal/binding/runtime" - cmd := utils.GoList(fmt.Sprintf("{{if not .Standard}}{{if eq .ImportPath \"%v\"}}{{else}}{{range .Imports}}{{if eq . \"github.com/therecipe/qt/interop\"}}{{.}}{{end}}{{end}}{{end}}{{end}}", strings.Join(stdImport, "\" \"")), "-deps", utils.BuildTags(tags)) + cmd := utils.GoList(fmt.Sprintf("{{if not .Standard}}{{if eq .ImportPath \"%v\"}}{{else}}{{range .Imports}}{{if eq . \"github.com/StarAurryon/qt/interop\"}}{{.}}{{end}}{{end}}{{end}}{{end}}", strings.Join(stdImport, "\" \"")), "-deps", utils.BuildTags(tags)) if !utils.UseGOMOD(path) || (utils.UseGOMOD(path) && !strings.Contains(strings.Replace(path, "\\", "/", -1), "/vendor/")) { cmd.Dir = path } else if utils.UseGOMOD(path) && strings.Contains(strings.Replace(path, "\\", "/", -1), "/vendor/") { @@ -126,9 +126,9 @@ func GetImports(path, target, tagsCustom string, level int, onlyDirect bool) []s stdImport[c] = k c++ } - stdImport[len(stdImport)-1] = "github.com/therecipe/qt/internal/binding/runtime" + stdImport[len(stdImport)-1] = "github.com/StarAurryon/qt/internal/binding/runtime" - cmd := utils.GoList(fmt.Sprintf("{{if not .Standard}}{{if eq .ImportPath \"%v\"}}{{else}}{{range .Imports}}{{if eq . \"github.com/therecipe/qt/flutter\"}}{{.}}{{end}}{{end}}{{end}}{{end}}", strings.Join(stdImport, "\" \"")), "-deps", utils.BuildTags(tags)) + cmd := utils.GoList(fmt.Sprintf("{{if not .Standard}}{{if eq .ImportPath \"%v\"}}{{else}}{{range .Imports}}{{if eq . \"github.com/StarAurryon/qt/flutter\"}}{{.}}{{end}}{{end}}{{end}}{{end}}", strings.Join(stdImport, "\" \"")), "-deps", utils.BuildTags(tags)) if !utils.UseGOMOD(path) || (utils.UseGOMOD(path) && !strings.Contains(strings.Replace(path, "\\", "/", -1), "/vendor/")) { cmd.Dir = path } else if utils.UseGOMOD(path) && strings.Contains(strings.Replace(path, "\\", "/", -1), "/vendor/") { @@ -197,8 +197,8 @@ func GetImports(path, target, tagsCustom string, level int, onlyDirect bool) []s wg.Done() }() - if strings.Contains(l, "github.com/therecipe/qt") && !(strings.Contains(l, "qt/internal") || strings.Contains(l, "qt/flutter") || strings.Contains(l, "qt/interop")) { - if strings.Contains(l, "github.com/therecipe/qt/") { + if strings.Contains(l, "github.com/StarAurryon/qt") && !(strings.Contains(l, "qt/internal") || strings.Contains(l, "qt/flutter") || strings.Contains(l, "qt/interop")) { + if strings.Contains(l, "github.com/StarAurryon/qt/") { importedStdMutex.Lock() importedStd[l] = struct{}{} importedStdMutex.Unlock() @@ -234,7 +234,7 @@ func GetImports(path, target, tagsCustom string, level int, onlyDirect bool) []s func GetQtStdImports() (o []string) { importedStdMutex.Lock() for k := range importedStd { - o = append(o, strings.TrimPrefix(k, "github.com/therecipe/qt/")) + o = append(o, strings.TrimPrefix(k, "github.com/StarAurryon/qt/")) } importedStdMutex.Unlock() return @@ -301,7 +301,7 @@ func GetGoFiles(path, target, tagsCustom string) []string { //TODO: directly parse go.mod to make it possible to skip "go mod download" func QtModVersion(path string) string { - cmd := exec.Command("go", "list", "-m", "-f", "{{.Version}}", "github.com/therecipe/qt") + cmd := exec.Command("go", "list", "-m", "-f", "{{.Version}}", "github.com/StarAurryon/qt") cmd.Dir = path version := strings.TrimSpace(utils.RunCmdOptional(cmd, "get qt tooling version")) if !strings.HasPrefix(version, "v") { @@ -323,7 +323,7 @@ func RestartWithPinnedVersion(path string) bool { return false } - cmd = exec.Command("go", "install", "-v", "-tags=no_env", "github.com/therecipe/qt/cmd/...") + cmd = exec.Command("go", "install", "-v", "-tags=no_env", "github.com/StarAurryon/qt/cmd/...") cmd.Dir = path cmd.Env = append(os.Environ(), "GOBIN="+utils.GOBIN()) utils.RunCmd(cmd, "re-install qt tooling based on the go.mod version") diff --git a/internal/cmd/utils_msvc.go b/internal/cmd/utils_msvc.go index d097e0631..298cfdc5c 100644 --- a/internal/cmd/utils_msvc.go +++ b/internal/cmd/utils_msvc.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/therecipe/qt/internal/utils" + "github.com/StarAurryon/qt/internal/utils" ) var rep = map[string]string{ diff --git a/internal/docker/android/Dockerfile b/internal/docker/android/Dockerfile index 5a5f53509..dc06a954b 100644 --- a/internal/docker/android/Dockerfile +++ b/internal/docker/android/Dockerfile @@ -41,7 +41,7 @@ ENV QT_DOCKER true COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt COPY --from=therecipe/qt:linux /opt/Qt5.13.0/5.13.0/android_armv7 /opt/Qt5.13.0/5.13.0/android_armv7 COPY --from=therecipe/qt:linux /opt/Qt5.13.0/5.13.0/android_x86 /opt/Qt5.13.0/5.13.0/android_x86 COPY --from=therecipe/qt:linux /opt/Qt5.13.0/5.13.0/android_arm64_v8a /opt/Qt5.13.0/5.13.0/android_arm64_v8a @@ -58,16 +58,16 @@ RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check android RUN $GOPATH/bin/qtsetup generate android RUN $GOPATH/bin/qtsetup install android -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/androidextras/jni && $GOPATH/bin/qtdeploy build android && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/androidextras/jni && $GOPATH/bin/qtdeploy build android && rm -rf ./deploy RUN GOARCH=arm64 $GOPATH/bin/qtsetup check android RUN GOARCH=arm64 $GOPATH/bin/qtsetup generate android RUN GOARCH=arm64 $GOPATH/bin/qtsetup install android -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/androidextras/jni && GOARCH=arm64 $GOPATH/bin/qtdeploy build android && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/androidextras/jni && GOARCH=arm64 $GOPATH/bin/qtdeploy build android && rm -rf ./deploy RUN $GOPATH/bin/qtsetup check android-emulator RUN $GOPATH/bin/qtsetup generate android-emulator RUN $GOPATH/bin/qtsetup install android-emulator -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/androidextras/jni && $GOPATH/bin/qtdeploy build android-emulator && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/androidextras/jni && $GOPATH/bin/qtdeploy build android-emulator && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/darwin/Dockerfile b/internal/docker/darwin/Dockerfile index 5cf1fd0b8..fcc9ac97a 100644 --- a/internal/docker/darwin/Dockerfile +++ b/internal/docker/darwin/Dockerfile @@ -36,7 +36,7 @@ RUN ln -s /osxcross/target/bin/x86_64-apple-darwin19-otool /usr/bin/otool RUN ln -s /osxcross/target/bin/x86_64-apple-darwin19-install_name_tool /usr/bin/install_name_tool RUN GO=go1.13.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local -RUN go get github.com/therecipe/qt/cmd/... +RUN go get github.com/StarAurryon/qt/cmd/... RUN go get github.com/therecipe/env_darwin_amd64_513 && DST=$GOPATH/src/github.com/therecipe/env_darwin_amd64_513/5.13.0/clang_64/bin && rm -r $DST && cp -r $GOPATH/src/github.com/therecipe/env_linux_amd64_513/5.13.0/gcc_64/bin $DST RUN sed -i -e 's/error/warning/g' $GOPATH/src/github.com/therecipe/env_darwin_amd64_513/5.13.0/clang_64/mkspecs/features/mac/default_pre.prf @@ -62,7 +62,7 @@ ENV CXX /osxcross/target/bin/x86_64-apple-darwin19-clang++ RUN $GOPATH/bin/qtsetup prep darwin RUN $GOPATH/bin/qtsetup check darwin RUN $GOPATH/bin/qtsetup generate darwin -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build darwin && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build darwin && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config diff --git a/internal/docker/darwin/Dockerfile.512 b/internal/docker/darwin/Dockerfile.512 index 0c0eaa4b0..0f737e6fe 100644 --- a/internal/docker/darwin/Dockerfile.512 +++ b/internal/docker/darwin/Dockerfile.512 @@ -36,7 +36,7 @@ RUN ln -s /osxcross/target/bin/x86_64-apple-darwin19-otool /usr/bin/otool RUN ln -s /osxcross/target/bin/x86_64-apple-darwin19-install_name_tool /usr/bin/install_name_tool RUN GO=go1.13.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local -RUN go get -tags=no_env github.com/therecipe/qt/cmd/... && go get github.com/therecipe/env_linux_amd64_512 +RUN go get -tags=no_env github.com/StarAurryon/qt/cmd/... && go get github.com/therecipe/env_linux_amd64_512 RUN go get github.com/therecipe/env_darwin_amd64_512 && DST=$GOPATH/src/github.com/therecipe/env_darwin_amd64_512/5.12.0/clang_64/bin && rm -r $DST && cp -r $GOPATH/src/github.com/therecipe/env_linux_amd64_512/5.12.0/gcc_64/bin $DST RUN sed -i -e 's/error/warning/g' $GOPATH/src/github.com/therecipe/env_darwin_amd64_512/5.12.0/clang_64/mkspecs/features/mac/default_pre.prf @@ -62,6 +62,6 @@ ENV CXX /osxcross/target/bin/x86_64-apple-darwin19-clang++ RUN $GOPATH/bin/qtsetup prep darwin RUN $GOPATH/bin/qtsetup check darwin RUN $GOPATH/bin/qtsetup generate darwin -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build darwin && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build darwin && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/darwin/Dockerfile.static b/internal/docker/darwin/Dockerfile.static index a9e90072b..73437f5a4 100644 --- a/internal/docker/darwin/Dockerfile.static +++ b/internal/docker/darwin/Dockerfile.static @@ -37,7 +37,7 @@ RUN ln -s /osxcross/target/bin/x86_64-apple-darwin19-otool /usr/bin/otool RUN ln -s /osxcross/target/bin/x86_64-apple-darwin19-install_name_tool /usr/bin/install_name_tool RUN GO=go1.13.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local -RUN go get github.com/therecipe/qt/cmd/... +RUN go get github.com/StarAurryon/qt/cmd/... RUN DST=$GOPATH/src/github.com/therecipe/env_darwin_amd64_513/5.13.0/clang_64/bin && rm -r $DST && cp -r $GOPATH/src/github.com/therecipe/env_linux_amd64_513/5.13.0/gcc_64/bin $DST RUN sed -i -e 's/error/warning/g' $GOPATH/src/github.com/therecipe/env_darwin_amd64_513/5.13.0/clang_64/mkspecs/features/mac/default_pre.prf @@ -56,7 +56,7 @@ ENV CXX /osxcross/target/bin/x86_64-apple-darwin19-clang++ RUN $GOPATH/bin/qtsetup prep darwin RUN $GOPATH/bin/qtsetup check darwin RUN $GOPATH/bin/qtsetup generate darwin -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build darwin && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build darwin && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config diff --git a/internal/docker/docker_darwin_ci_template.yml b/internal/docker/docker_darwin_ci_template.yml index 83b5e1967..822c48d9a 100644 --- a/internal/docker/docker_darwin_ci_template.yml +++ b/internal/docker/docker_darwin_ci_template.yml @@ -9,7 +9,7 @@ jobs: GO111MODULE: off steps: - - script: 'go get -v github.com/therecipe/qt/cmd/... && $(go env GOPATH)/bin/qtsetup' + script: 'go get -v github.com/StarAurryon/qt/cmd/... && $(go env GOPATH)/bin/qtsetup' - job: '${{ parameters.name }}_module' timeoutInMinutes: 0 @@ -20,4 +20,4 @@ jobs: GO111MODULE: on steps: - - script: 'xcode-select --install; mkdir -p $(go env GOPATH)/src && cd $(go env GOPATH)/src && git clone https://github.com/therecipe/examples.git && cd ./examples && go install -v -tags=no_env github.com/therecipe/qt/cmd/... && go mod vendor && git clone https://github.com/therecipe/env_darwin_amd64_513.git vendor/github.com/therecipe/env_darwin_amd64_513 && $(go env GOPATH)/bin/qtsetup && $(go env GOPATH)/bin/qtdeploy test desktop ./basic/widgets' + script: 'xcode-select --install; mkdir -p $(go env GOPATH)/src && cd $(go env GOPATH)/src && git clone https://github.com/therecipe/examples.git && cd ./examples && go install -v -tags=no_env github.com/StarAurryon/qt/cmd/... && go mod vendor && git clone https://github.com/therecipe/env_darwin_amd64_513.git vendor/github.com/therecipe/env_darwin_amd64_513 && $(go env GOPATH)/bin/qtsetup && $(go env GOPATH)/bin/qtdeploy test desktop ./basic/widgets' diff --git a/internal/docker/docker_linux_ci_template.yml b/internal/docker/docker_linux_ci_template.yml index 43952a5cf..79c7745f6 100644 --- a/internal/docker/docker_linux_ci_template.yml +++ b/internal/docker/docker_linux_ci_template.yml @@ -12,7 +12,7 @@ jobs: - script: sudo apt-get -qq update && sudo apt-get --no-install-recommends -qq -y install build-essential libglib2.0-dev libglu1-mesa-dev libpulse-dev fcitx-frontend-qt5 - - script: 'go get -v github.com/therecipe/qt/cmd/... && $(go env GOPATH)/bin/qtsetup' + script: 'go get -v github.com/StarAurryon/qt/cmd/... && $(go env GOPATH)/bin/qtsetup' - job: '${{ parameters.name }}_module' timeoutInMinutes: 0 @@ -26,4 +26,4 @@ jobs: - script: sudo apt-get -qq update && sudo apt-get --no-install-recommends -qq -y install build-essential libglib2.0-dev libglu1-mesa-dev libpulse-dev fcitx-frontend-qt5 - - script: 'mkdir -p $(go env GOPATH)/src && cd $(go env GOPATH)/src && git clone https://github.com/therecipe/examples.git && cd ./examples && go install -v -tags=no_env github.com/therecipe/qt/cmd/... && go mod vendor && git clone https://github.com/therecipe/env_linux_amd64_513.git vendor/github.com/therecipe/env_linux_amd64_513 && $(go env GOPATH)/bin/qtsetup && $(go env GOPATH)/bin/qtdeploy test desktop ./basic/widgets' + script: 'mkdir -p $(go env GOPATH)/src && cd $(go env GOPATH)/src && git clone https://github.com/therecipe/examples.git && cd ./examples && go install -v -tags=no_env github.com/StarAurryon/qt/cmd/... && go mod vendor && git clone https://github.com/therecipe/env_linux_amd64_513.git vendor/github.com/therecipe/env_linux_amd64_513 && $(go env GOPATH)/bin/qtsetup && $(go env GOPATH)/bin/qtdeploy test desktop ./basic/widgets' diff --git a/internal/docker/docker_showcase_template.yml b/internal/docker/docker_showcase_template.yml index f09665852..b9e794213 100644 --- a/internal/docker/docker_showcase_template.yml +++ b/internal/docker/docker_showcase_template.yml @@ -19,6 +19,6 @@ jobs: - script: 'brew install bbe' - - script: 'go get -v -tags=no_env github.com/therecipe/qt/cmd/... && $(go env GOPATH)/bin/qtsetup prep' + script: 'go get -v -tags=no_env github.com/StarAurryon/qt/cmd/... && $(go env GOPATH)/bin/qtsetup prep' - script: 'go get -v -d github.com/therecipe/${{ parameters.tag }} && cd $(go env GOPATH)/src/github.com/therecipe/${{ parameters.tag }} && ./deploy.sh && GITHUB_SECRET=$(GITHUB_SECRET) ./push.sh' diff --git a/internal/docker/docker_windows_ci_template.yml b/internal/docker/docker_windows_ci_template.yml index 493e04dab..3faeb8d1e 100644 --- a/internal/docker/docker_windows_ci_template.yml +++ b/internal/docker/docker_windows_ci_template.yml @@ -9,7 +9,7 @@ jobs: GO111MODULE: off steps: - - script: 'go get -v github.com/therecipe/qt/cmd/... && C:\Users\VssAdministrator\go\bin\qtsetup' + script: 'go get -v github.com/StarAurryon/qt/cmd/... && C:\Users\VssAdministrator\go\bin\qtsetup' - job: '${{ parameters.name }}_module' timeoutInMinutes: 0 @@ -22,5 +22,5 @@ jobs: - script: 'md C:\Users\VssAdministrator\go\src && git clone https://github.com/therecipe/examples.git C:\Users\VssAdministrator\go\src\examples' - - script: 'go install -v -tags=no_env github.com/therecipe/qt/cmd/... && go mod vendor && git clone https://github.com/therecipe/env_windows_amd64_513.git vendor/github.com/therecipe/env_windows_amd64_513 && C:\Users\VssAdministrator\go\bin\qtsetup && C:\Users\VssAdministrator\go\bin\qtdeploy test desktop ./basic/widgets' + script: 'go install -v -tags=no_env github.com/StarAurryon/qt/cmd/... && go mod vendor && git clone https://github.com/therecipe/env_windows_amd64_513.git vendor/github.com/therecipe/env_windows_amd64_513 && C:\Users\VssAdministrator\go\bin\qtsetup && C:\Users\VssAdministrator\go\bin\qtdeploy test desktop ./basic/widgets' workingDirectory: C:\Users\VssAdministrator\go\src\examples \ No newline at end of file diff --git a/internal/docker/js/Dockerfile.js b/internal/docker/js/Dockerfile.js index c4a9388ae..761dd5e5c 100644 --- a/internal/docker/js/Dockerfile.js +++ b/internal/docker/js/Dockerfile.js @@ -6,7 +6,7 @@ ENV GOPATH $HOME/work RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git RUN GO=go1.12.9.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM ubuntu:16.04 @@ -22,7 +22,7 @@ ENV QT_QMAKE_DIR /usr/local/Qt-5.13.0/bin COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt COPY --from=therecipe/qt:js_base $HOME/emsdk $HOME/emsdk COPY --from=therecipe/qt:js_base $HOME/.emscripten $HOME/.emscripten COPY --from=therecipe/qt:js_base /usr/local/Qt-5.13.0 /usr/local/Qt-5.13.0 @@ -37,6 +37,6 @@ RUN $GOPATH/bin/qtsetup check js RUN QT_STUB=true $GOPATH/bin/qtsetup generate RUN $GOPATH/bin/qtsetup generate js RUN $GOPATH/bin/qtsetup install js -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build js && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build js && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/js/Dockerfile.js_thread b/internal/docker/js/Dockerfile.js_thread index fb509adc1..68558e57f 100644 --- a/internal/docker/js/Dockerfile.js_thread +++ b/internal/docker/js/Dockerfile.js_thread @@ -6,7 +6,7 @@ ENV GOPATH $HOME/work RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git RUN GO=go1.12.9.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM ubuntu:16.04 @@ -22,7 +22,7 @@ ENV QT_QMAKE_DIR /usr/local/Qt-5.13.0/bin COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt COPY --from=therecipe/qt:js_base_thread $HOME/emsdk $HOME/emsdk COPY --from=therecipe/qt:js_base_thread $HOME/.emscripten $HOME/.emscripten COPY --from=therecipe/qt:js_base_thread /usr/local/Qt-5.13.0 /usr/local/Qt-5.13.0 @@ -37,6 +37,6 @@ RUN $GOPATH/bin/qtsetup check js RUN QT_STUB=true $GOPATH/bin/qtsetup generate RUN $GOPATH/bin/qtsetup generate js RUN $GOPATH/bin/qtsetup install js -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build js && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build js && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/js/Dockerfile.wasm b/internal/docker/js/Dockerfile.wasm index a943c6364..b34690288 100644 --- a/internal/docker/js/Dockerfile.wasm +++ b/internal/docker/js/Dockerfile.wasm @@ -11,7 +11,7 @@ ENV QT_QMAKE_DIR /usr/local/Qt-5.13.0/bin COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt COPY --from=therecipe/qt:js_base $HOME/emsdk $HOME/emsdk COPY --from=therecipe/qt:js_base $HOME/.emscripten $HOME/.emscripten COPY --from=therecipe/qt:js_base /usr/local/Qt-5.13.0 /usr/local/Qt-5.13.0 @@ -24,6 +24,6 @@ RUN $GOPATH/bin/qtsetup check wasm RUN QT_STUB=true $GOPATH/bin/qtsetup generate RUN $GOPATH/bin/qtsetup generate wasm RUN $GOPATH/bin/qtsetup install wasm -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build wasm && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build wasm && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/js/Dockerfile.wasm_thread b/internal/docker/js/Dockerfile.wasm_thread index 2964c82e1..929f48fd8 100644 --- a/internal/docker/js/Dockerfile.wasm_thread +++ b/internal/docker/js/Dockerfile.wasm_thread @@ -11,7 +11,7 @@ ENV QT_QMAKE_DIR /usr/local/Qt-5.13.0/bin COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt COPY --from=therecipe/qt:js_base_thread $HOME/emsdk $HOME/emsdk COPY --from=therecipe/qt:js_base_thread $HOME/.emscripten $HOME/.emscripten COPY --from=therecipe/qt:js_base_thread /usr/local/Qt-5.13.0 /usr/local/Qt-5.13.0 @@ -24,6 +24,6 @@ RUN $GOPATH/bin/qtsetup check wasm RUN QT_STUB=true $GOPATH/bin/qtsetup generate RUN $GOPATH/bin/qtsetup generate wasm RUN $GOPATH/bin/qtsetup install wasm -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build wasm && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build wasm && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/linux/Dockerfile b/internal/docker/linux/Dockerfile index b82a91604..c22cac68a 100644 --- a/internal/docker/linux/Dockerfile +++ b/internal/docker/linux/Dockerfile @@ -6,12 +6,12 @@ ENV GOPATH $HOME/work RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git RUN GO=go1.13.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install dbus fontconfig libx11-6 libx11-xcb1 ENV QT qt-opensource-linux-x64-5.13.0.run RUN curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/archive/qt/5.13/5.13.0/$QT && chmod +x $QT -RUN QT_QPA_PLATFORM=minimal ./$QT --no-force-installations --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true +RUN QT_QPA_PLATFORM=minimal ./$QT --no-force-installations --script $GOPATH/src/github.com/StarAurryon/qt/internal/ci/iscript.qs LINUX=true RUN find /opt/Qt5.13.0/5.13.0 -type f -name "*.debug" -delete RUN find /opt/Qt5.13.0/Docs -type f ! -name "*.index" -delete RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install binutils @@ -31,7 +31,7 @@ ENV QT_VERSION 5.13.0 COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt COPY --from=base /opt/Qt5.13.0/5.13.0 /opt/Qt5.13.0/5.13.0 COPY --from=base /opt/Qt5.13.0/Docs /opt/Qt5.13.0/Docs COPY --from=base /opt/Qt5.13.0/Licenses /opt/Qt5.13.0/Licenses @@ -42,7 +42,7 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install build-e RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config diff --git a/internal/docker/linux/Dockerfile.512 b/internal/docker/linux/Dockerfile.512 index 0e347f1ff..ace98a9a6 100644 --- a/internal/docker/linux/Dockerfile.512 +++ b/internal/docker/linux/Dockerfile.512 @@ -6,12 +6,12 @@ ENV GOPATH $HOME/work RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git RUN GO=go1.13.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install dbus fontconfig libx11-6 libx11-xcb1 ENV QT qt-opensource-linux-x64-5.12.4.run RUN curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/archive/qt/5.12/5.12.4/$QT && chmod +x $QT -RUN QT_QPA_PLATFORM=minimal ./$QT --no-force-installations --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true VERSION=qt5.5124 +RUN QT_QPA_PLATFORM=minimal ./$QT --no-force-installations --script $GOPATH/src/github.com/StarAurryon/qt/internal/ci/iscript.qs LINUX=true VERSION=qt5.5124 RUN find /opt/Qt5.12.4/5.12.4 -type f -name "*.debug" -delete RUN find /opt/Qt5.12.4/Docs -type f ! -name "*.index" -delete RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install binutils @@ -31,7 +31,7 @@ ENV QT_VERSION 5.12.4 COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt COPY --from=base /opt/Qt5.12.4/5.12.4 /opt/Qt5.12.4/5.12.4 COPY --from=base /opt/Qt5.12.4/Docs /opt/Qt5.12.4/Docs @@ -41,6 +41,6 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install build-e RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/linux/Dockerfile.56 b/internal/docker/linux/Dockerfile.56 index 6787d499e..a73b2baad 100644 --- a/internal/docker/linux/Dockerfile.56 +++ b/internal/docker/linux/Dockerfile.56 @@ -6,13 +6,13 @@ ENV GOPATH $HOME/work RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git RUN GO=go1.13.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install dbus fontconfig libx11-6 libx11-xcb1 ENV QT qt-opensource-linux-x64-5.6.3.run RUN curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/new_archive/qt/5.6/5.6.3/$QT && chmod +x $QT RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libglib2.0-dev libglu1-mesa-dev -RUN QT_QPA_PLATFORM=minimal ./$QT --no-force-installations --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true VERSION=563 +RUN QT_QPA_PLATFORM=minimal ./$QT --no-force-installations --script $GOPATH/src/github.com/StarAurryon/qt/internal/ci/iscript.qs LINUX=true VERSION=563 RUN find /opt/Qt5.6.3/5.6.3 -type f -name "*.debug" -delete RUN find /opt/Qt5.6.3/Docs -type f ! -name "*.index" -delete RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install binutils @@ -32,7 +32,7 @@ ENV QT_VERSION 5.6.3 COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt COPY --from=base /opt/Qt5.6.3/5.6.3/gcc_64 /opt/Qt5.6.3/5.6.3/gcc_64 COPY --from=base /opt/Qt5.6.3/Docs /opt/Qt5.6.3/Docs @@ -42,6 +42,6 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install build-e RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/linux/Dockerfile.59 b/internal/docker/linux/Dockerfile.59 index a46a02420..419d72e57 100644 --- a/internal/docker/linux/Dockerfile.59 +++ b/internal/docker/linux/Dockerfile.59 @@ -6,12 +6,12 @@ ENV GOPATH $HOME/work RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git RUN GO=go1.13.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install dbus fontconfig libx11-6 libx11-xcb1 ENV QT qt-opensource-linux-x64-5.9.6.run RUN curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/archive/qt/5.9/5.9.6/$QT && chmod +x $QT -RUN QT_QPA_PLATFORM=minimal ./$QT --no-force-installations --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true VERSION=596 +RUN QT_QPA_PLATFORM=minimal ./$QT --no-force-installations --script $GOPATH/src/github.com/StarAurryon/qt/internal/ci/iscript.qs LINUX=true VERSION=596 RUN find /opt/Qt5.9.6/5.9.6 -type f -name "*.debug" -delete RUN find /opt/Qt5.9.6/Docs -type f ! -name "*.index" -delete RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install binutils @@ -31,7 +31,7 @@ ENV QT_VERSION 5.9.6 COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt COPY --from=base /opt/Qt5.9.6/5.9.6 /opt/Qt5.9.6/5.9.6 COPY --from=base /opt/Qt5.9.6/Docs /opt/Qt5.9.6/Docs @@ -41,6 +41,6 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install build-e RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/linux/Dockerfile.arch b/internal/docker/linux/Dockerfile.arch index 7c402a3c2..07cb865c1 100644 --- a/internal/docker/linux/Dockerfile.arch +++ b/internal/docker/linux/Dockerfile.arch @@ -7,7 +7,7 @@ ENV GOPATH $HOME/work RUN pacman -Syyu --quiet || true RUN pacman -S --noconfirm --needed --noprogressbar --quiet ca-certificates curl git tar RUN GO=go1.13.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM archlinux/base LABEL maintainer therecipe @@ -22,7 +22,7 @@ ENV QT_PKG_CONFIG true COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN pacman -Syyu --quiet || true RUN pacman -S --noconfirm --needed --noprogressbar --quiet base-devel glibc pkg-config && pacman -Scc --noconfirm --noprogressbar --quiet @@ -31,6 +31,6 @@ RUN pacman -S --noconfirm --needed --noprogressbar --quiet qt5 && pacman -Scc -- RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN pacman -S --noconfirm --needed --noprogressbar --quiet ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/linux/Dockerfile.debian_10 b/internal/docker/linux/Dockerfile.debian_10 index 70b75d2b9..75d990d61 100644 --- a/internal/docker/linux/Dockerfile.debian_10 +++ b/internal/docker/linux/Dockerfile.debian_10 @@ -6,7 +6,7 @@ ENV GOPATH $HOME/work RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git RUN GO=go1.13.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM debian:10.0 LABEL maintainer therecipe @@ -21,7 +21,7 @@ ENV QT_PKG_CONFIG true COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install build-essential libglib2.0-dev libglu1-mesa-dev libpulse-dev && apt-get -qq clean RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5-dev qt*5-dev qt*5-doc-html && apt-get -qq clean @@ -29,6 +29,6 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5 RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/linux/Dockerfile.debian_10_arm64 b/internal/docker/linux/Dockerfile.debian_10_arm64 index 2f2119c57..314d0b280 100644 --- a/internal/docker/linux/Dockerfile.debian_10_arm64 +++ b/internal/docker/linux/Dockerfile.debian_10_arm64 @@ -5,7 +5,7 @@ ENV HOME /home/$USER ENV GOPATH $HOME/work RUN [ "cross-build-start" ] -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM balenalib/generic-aarch64-debian:buster LABEL maintainer therecipe @@ -21,7 +21,7 @@ RUN [ "cross-build-start" ] COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install build-essential libglib2.0-dev libglu1-mesa-dev libpulse-dev && apt-get -qq clean RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5-dev qt*5-dev qt*5-doc-html && apt-get -qq clean @@ -29,7 +29,7 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5 RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config diff --git a/internal/docker/linux/Dockerfile.debian_10_armv6 b/internal/docker/linux/Dockerfile.debian_10_armv6 index bf74511a0..8a80b9841 100644 --- a/internal/docker/linux/Dockerfile.debian_10_armv6 +++ b/internal/docker/linux/Dockerfile.debian_10_armv6 @@ -5,7 +5,7 @@ ENV HOME /home/$USER ENV GOPATH $HOME/work RUN [ "cross-build-start" ] -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM balenalib/raspberry-pi-debian:buster LABEL maintainer therecipe @@ -21,7 +21,7 @@ RUN [ "cross-build-start" ] COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install build-essential libglib2.0-dev libglu1-mesa-dev libpulse-dev && apt-get -qq clean RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5-dev qt*5-dev qt*5-doc-html && apt-get -qq clean @@ -29,7 +29,7 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5 RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config diff --git a/internal/docker/linux/Dockerfile.debian_10_armv7 b/internal/docker/linux/Dockerfile.debian_10_armv7 index b4f4a4056..49e24f099 100644 --- a/internal/docker/linux/Dockerfile.debian_10_armv7 +++ b/internal/docker/linux/Dockerfile.debian_10_armv7 @@ -5,7 +5,7 @@ ENV HOME /home/$USER ENV GOPATH $HOME/work RUN [ "cross-build-start" ] -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM balenalib/generic-armv7ahf-debian:buster LABEL maintainer therecipe @@ -21,7 +21,7 @@ RUN [ "cross-build-start" ] COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install build-essential libglib2.0-dev libglu1-mesa-dev libpulse-dev && apt-get -qq clean RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5-dev qt*5-dev qt*5-doc-html && apt-get -qq clean @@ -29,7 +29,7 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5 RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config diff --git a/internal/docker/linux/Dockerfile.debian_9 b/internal/docker/linux/Dockerfile.debian_9 index a2b1df103..d5d08b5e3 100644 --- a/internal/docker/linux/Dockerfile.debian_9 +++ b/internal/docker/linux/Dockerfile.debian_9 @@ -6,7 +6,7 @@ ENV GOPATH $HOME/work RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git RUN GO=go1.13.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM debian:9.0 LABEL maintainer therecipe @@ -20,7 +20,7 @@ ENV QT_PKG_CONFIG true COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install build-essential libglib2.0-dev libglu1-mesa-dev libpulse-dev && apt-get -qq clean RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5-dev qt*5-dev qt*5-doc-html && apt-get -qq clean @@ -28,6 +28,6 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5 RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/linux/Dockerfile.debian_9_arm64 b/internal/docker/linux/Dockerfile.debian_9_arm64 index a92cc9424..7c06b848d 100644 --- a/internal/docker/linux/Dockerfile.debian_9_arm64 +++ b/internal/docker/linux/Dockerfile.debian_9_arm64 @@ -5,7 +5,7 @@ ENV HOME /home/$USER ENV GOPATH $HOME/work RUN [ "cross-build-start" ] -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM balenalib/generic-aarch64-debian:stretch LABEL maintainer therecipe @@ -20,7 +20,7 @@ RUN [ "cross-build-start" ] COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install build-essential libglib2.0-dev libglu1-mesa-dev libpulse-dev && apt-get -qq clean RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5-dev qt*5-dev qt*5-doc-html && apt-get -qq clean @@ -28,7 +28,7 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5 RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config diff --git a/internal/docker/linux/Dockerfile.debian_9_armv6 b/internal/docker/linux/Dockerfile.debian_9_armv6 index 6030dc1fa..3a30273d4 100644 --- a/internal/docker/linux/Dockerfile.debian_9_armv6 +++ b/internal/docker/linux/Dockerfile.debian_9_armv6 @@ -5,7 +5,7 @@ ENV HOME /home/$USER ENV GOPATH $HOME/work RUN [ "cross-build-start" ] -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM balenalib/raspberry-pi-debian:stretch LABEL maintainer therecipe @@ -20,7 +20,7 @@ RUN [ "cross-build-start" ] COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install build-essential libglib2.0-dev libglu1-mesa-dev libpulse-dev && apt-get -qq clean RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5-dev qt*5-dev qt*5-doc-html && apt-get -qq clean @@ -28,7 +28,7 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5 RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config diff --git a/internal/docker/linux/Dockerfile.debian_9_armv7 b/internal/docker/linux/Dockerfile.debian_9_armv7 index 615abdb76..cb2f7449e 100644 --- a/internal/docker/linux/Dockerfile.debian_9_armv7 +++ b/internal/docker/linux/Dockerfile.debian_9_armv7 @@ -5,7 +5,7 @@ ENV HOME /home/$USER ENV GOPATH $HOME/work RUN [ "cross-build-start" ] -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM balenalib/generic-armv7ahf-debian:stretch LABEL maintainer therecipe @@ -20,7 +20,7 @@ RUN [ "cross-build-start" ] COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install build-essential libglib2.0-dev libglu1-mesa-dev libpulse-dev && apt-get -qq clean RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5-dev qt*5-dev qt*5-doc-html && apt-get -qq clean @@ -28,7 +28,7 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5 RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config diff --git a/internal/docker/linux/Dockerfile.fedora b/internal/docker/linux/Dockerfile.fedora index ec00f7fd3..1f4484994 100644 --- a/internal/docker/linux/Dockerfile.fedora +++ b/internal/docker/linux/Dockerfile.fedora @@ -6,7 +6,7 @@ ENV GOPATH $HOME/work RUN yum makecache && yum --skip-broken -y install git RUN GO=go1.13.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM fedora:latest LABEL maintainer therecipe @@ -21,7 +21,7 @@ ENV QT_PKG_CONFIG true COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN yum makecache && yum -y groupinstall "C Development Tools and Libraries" && yum clean all RUN yum makecache && yum --skip-broken -y install mesa-libGLU-devel gstreamer-plugins-base pulseaudio-libs-devel glib2-devel && yum clean all @@ -30,6 +30,6 @@ RUN yum makecache && yum --skip-broken -y install qt5-* qt5-*-doc && yum clean a RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN yum makecache && yum --skip-broken -y install git pkg-config \ No newline at end of file diff --git a/internal/docker/linux/Dockerfile.fedora_arm64 b/internal/docker/linux/Dockerfile.fedora_arm64 index 0da5074dc..9b87c0f1b 100644 --- a/internal/docker/linux/Dockerfile.fedora_arm64 +++ b/internal/docker/linux/Dockerfile.fedora_arm64 @@ -5,7 +5,7 @@ ENV HOME /home/$USER ENV GOPATH $HOME/work RUN [ "cross-build-start" ] -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM balenalib/generic-aarch64-fedora:latest LABEL maintainer therecipe @@ -21,7 +21,7 @@ RUN [ "cross-build-start" ] COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN yum makecache && yum -y groupinstall "C Development Tools and Libraries" && yum clean all RUN yum makecache && yum --skip-broken -y install mesa-libGLU-devel gstreamer-plugins-base pulseaudio-libs-devel glib2-devel && yum clean all @@ -30,7 +30,7 @@ RUN yum makecache && yum --skip-broken -y install qt5-* qt5-*-doc && yum clean a RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN yum makecache && yum --skip-broken -y install git pkg-config diff --git a/internal/docker/linux/Dockerfile.fedora_armv7 b/internal/docker/linux/Dockerfile.fedora_armv7 index 922960748..a189d360d 100644 --- a/internal/docker/linux/Dockerfile.fedora_armv7 +++ b/internal/docker/linux/Dockerfile.fedora_armv7 @@ -5,7 +5,7 @@ ENV HOME /home/$USER ENV GOPATH $HOME/work RUN [ "cross-build-start" ] -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM balenalib/generic-armv7ahf-fedora:latest LABEL maintainer therecipe @@ -21,7 +21,7 @@ RUN [ "cross-build-start" ] COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN yum makecache && yum -y groupinstall "C Development Tools and Libraries" && yum clean all RUN yum makecache && yum --skip-broken -y install mesa-libGLU-devel gstreamer-plugins-base pulseaudio-libs-devel glib2-devel && yum clean all @@ -30,7 +30,7 @@ RUN yum makecache && yum --skip-broken -y install qt5-* qt5-*-doc && yum clean a RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN yum makecache && yum --skip-broken -y install git pkg-config diff --git a/internal/docker/linux/Dockerfile.static b/internal/docker/linux/Dockerfile.static index b202aaee2..bafb37f64 100644 --- a/internal/docker/linux/Dockerfile.static +++ b/internal/docker/linux/Dockerfile.static @@ -6,7 +6,7 @@ ENV GOPATH $HOME/work RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git RUN GO=go1.13.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM therecipe/qt:linux_static_base as fcitx @@ -40,7 +40,7 @@ ENV QT_STATIC true COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt COPY --from=therecipe/qt:linux_static_base /opt/Qt/5.13.0 /opt/Qt/5.13.0 COPY --from=fcitx /fcitx-qt5/platforminputcontext/libfcitxplatforminputcontextplugin.a /opt/Qt/5.13.0/gcc_64/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.a @@ -51,7 +51,7 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libfont RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config diff --git a/internal/docker/linux/Dockerfile.suse_leap b/internal/docker/linux/Dockerfile.suse_leap index e6891cd15..8a9f1200d 100644 --- a/internal/docker/linux/Dockerfile.suse_leap +++ b/internal/docker/linux/Dockerfile.suse_leap @@ -4,7 +4,7 @@ ENV GOPATH $HOME/work RUN zypper -q ref && zypper -n -q install --no-recommends curl git gzip tar RUN GO=go1.13.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM opensuse/leap:latest LABEL maintainer therecipe @@ -16,7 +16,7 @@ ENV QT_PKG_CONFIG true COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN zypper -q ref && zypper -n -q install --no-recommends -t pattern devel_basis && zypper clean -a RUN zypper -q ref && zypper -n -q install --no-recommends libqt5-qt*-devel && zypper clean -a @@ -24,6 +24,6 @@ RUN zypper -q ref && zypper -n -q install --no-recommends libqt5-qt*-devel && zy RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN zypper -q ref && zypper -n -q install --no-recommends git pkg-config \ No newline at end of file diff --git a/internal/docker/linux/Dockerfile.suse_tumbleweed b/internal/docker/linux/Dockerfile.suse_tumbleweed index 78b47699f..cbbfd2d1e 100644 --- a/internal/docker/linux/Dockerfile.suse_tumbleweed +++ b/internal/docker/linux/Dockerfile.suse_tumbleweed @@ -4,7 +4,7 @@ ENV GOPATH $HOME/work RUN zypper -q ref && zypper -n -q install --no-recommends curl git gzip tar RUN GO=go1.13.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM opensuse/tumbleweed:latest LABEL maintainer therecipe @@ -17,7 +17,7 @@ ENV QT_PKG_CONFIG true COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN zypper -q ref && zypper -n -q install --no-recommends -t pattern devel_basis && zypper clean -a RUN zypper -q ref && zypper -n -q install --no-recommends libqt5-qt*-devel && zypper clean -a @@ -25,7 +25,7 @@ RUN zypper -q ref && zypper -n -q install --no-recommends libqt5-qt*-devel && zy RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN zypper -q ref && zypper -n -q install --no-recommends git RUN zypper -q ref && zypper -n -q install --no-recommends pkg-config || true \ No newline at end of file diff --git a/internal/docker/linux/Dockerfile.ubuntu_16_04 b/internal/docker/linux/Dockerfile.ubuntu_16_04 index 15f476520..95e4f0018 100644 --- a/internal/docker/linux/Dockerfile.ubuntu_16_04 +++ b/internal/docker/linux/Dockerfile.ubuntu_16_04 @@ -6,7 +6,7 @@ ENV GOPATH $HOME/work RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git RUN GO=go1.13.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM ubuntu:16.04 LABEL maintainer therecipe @@ -20,7 +20,7 @@ ENV QT_PKG_CONFIG true COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install build-essential libglib2.0-dev libglu1-mesa-dev libpulse-dev && apt-get -qq clean RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5-dev qt*5-dev qt*5-doc-html && apt-get -qq clean @@ -28,6 +28,6 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5 RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/bridge2 && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/bridge2 && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/linux/Dockerfile.ubuntu_16_04_arm64 b/internal/docker/linux/Dockerfile.ubuntu_16_04_arm64 index fa06cf1c0..f780edf66 100644 --- a/internal/docker/linux/Dockerfile.ubuntu_16_04_arm64 +++ b/internal/docker/linux/Dockerfile.ubuntu_16_04_arm64 @@ -5,7 +5,7 @@ ENV HOME /home/$USER ENV GOPATH $HOME/work RUN [ "cross-build-start" ] -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM balenalib/generic-aarch64-ubuntu:xenial LABEL maintainer therecipe @@ -20,7 +20,7 @@ RUN [ "cross-build-start" ] COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install build-essential libglib2.0-dev libglu1-mesa-dev libpulse-dev && apt-get -qq clean RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5-dev qt*5-dev qt*5-doc-html && apt-get -qq clean @@ -28,7 +28,7 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5 RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/bridge2 && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/bridge2 && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config diff --git a/internal/docker/linux/Dockerfile.ubuntu_16_04_armv7 b/internal/docker/linux/Dockerfile.ubuntu_16_04_armv7 index 77479335e..94ffea43b 100644 --- a/internal/docker/linux/Dockerfile.ubuntu_16_04_armv7 +++ b/internal/docker/linux/Dockerfile.ubuntu_16_04_armv7 @@ -5,7 +5,7 @@ ENV HOME /home/$USER ENV GOPATH $HOME/work RUN [ "cross-build-start" ] -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM balenalib/generic-armv7ahf-ubuntu:xenial LABEL maintainer therecipe @@ -20,7 +20,7 @@ RUN [ "cross-build-start" ] COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install build-essential libglib2.0-dev libglu1-mesa-dev libpulse-dev && apt-get -qq clean RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5-dev qt*5-dev qt*5-doc-html && apt-get -qq clean @@ -28,7 +28,7 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5 RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/bridge2 && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/bridge2 && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config diff --git a/internal/docker/linux/Dockerfile.ubuntu_18_04 b/internal/docker/linux/Dockerfile.ubuntu_18_04 index dbc93ea86..d66736398 100644 --- a/internal/docker/linux/Dockerfile.ubuntu_18_04 +++ b/internal/docker/linux/Dockerfile.ubuntu_18_04 @@ -6,7 +6,7 @@ ENV GOPATH $HOME/work RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git RUN GO=go1.13.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM ubuntu:18.04 LABEL maintainer therecipe @@ -20,7 +20,7 @@ ENV QT_PKG_CONFIG true COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install build-essential libglib2.0-dev libglu1-mesa-dev libpulse-dev && apt-get -qq clean RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5-dev qt*5-dev qt*5-doc-html && apt-get -qq clean @@ -28,6 +28,6 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5 RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/linux/Dockerfile.ubuntu_18_04_arm64 b/internal/docker/linux/Dockerfile.ubuntu_18_04_arm64 index a24e791a2..16e7cfcbe 100644 --- a/internal/docker/linux/Dockerfile.ubuntu_18_04_arm64 +++ b/internal/docker/linux/Dockerfile.ubuntu_18_04_arm64 @@ -5,7 +5,7 @@ ENV HOME /home/$USER ENV GOPATH $HOME/work RUN [ "cross-build-start" ] -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM balenalib/generic-aarch64-ubuntu:bionic LABEL maintainer therecipe @@ -20,7 +20,7 @@ RUN [ "cross-build-start" ] COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install build-essential libglib2.0-dev libglu1-mesa-dev libpulse-dev && apt-get -qq clean RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5-dev qt*5-dev qt*5-doc-html && apt-get -qq clean @@ -28,7 +28,7 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5 RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config diff --git a/internal/docker/linux/Dockerfile.ubuntu_18_04_armv7 b/internal/docker/linux/Dockerfile.ubuntu_18_04_armv7 index c14c8b326..813e37c4c 100644 --- a/internal/docker/linux/Dockerfile.ubuntu_18_04_armv7 +++ b/internal/docker/linux/Dockerfile.ubuntu_18_04_armv7 @@ -5,7 +5,7 @@ ENV HOME /home/$USER ENV GOPATH $HOME/work RUN [ "cross-build-start" ] -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM balenalib/generic-armv7ahf-ubuntu:bionic LABEL maintainer therecipe @@ -20,7 +20,7 @@ RUN [ "cross-build-start" ] COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install build-essential libglib2.0-dev libglu1-mesa-dev libpulse-dev && apt-get -qq clean RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5-dev qt*5-dev qt*5-doc-html && apt-get -qq clean @@ -28,7 +28,7 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libqt*5 RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check RUN $GOPATH/bin/qtsetup generate -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build linux && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config diff --git a/internal/docker/rpi/Dockerfile.base b/internal/docker/rpi/Dockerfile.base index 34ee6af0a..0431dc4db 100644 --- a/internal/docker/rpi/Dockerfile.base +++ b/internal/docker/rpi/Dockerfile.base @@ -16,7 +16,7 @@ ENV RPI_COMPILER gcc-linaro-arm-linux-gnueabihf-raspbian-x64 COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git make && apt-get -qq clean diff --git a/internal/docker/rpi/Dockerfile.rpi1 b/internal/docker/rpi/Dockerfile.rpi1 index c595a3145..9b112da0d 100644 --- a/internal/docker/rpi/Dockerfile.rpi1 +++ b/internal/docker/rpi/Dockerfile.rpi1 @@ -13,6 +13,6 @@ RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check rpi1 RUN $GOPATH/bin/qtsetup generate rpi1 RUN $GOPATH/bin/qtsetup install rpi1 -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build rpi1 && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build rpi1 && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/rpi/Dockerfile.rpi2 b/internal/docker/rpi/Dockerfile.rpi2 index e9a143498..b6752bbc1 100644 --- a/internal/docker/rpi/Dockerfile.rpi2 +++ b/internal/docker/rpi/Dockerfile.rpi2 @@ -13,6 +13,6 @@ RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check rpi2 RUN $GOPATH/bin/qtsetup generate rpi2 RUN $GOPATH/bin/qtsetup install rpi2 -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build rpi2 && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build rpi2 && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/rpi/Dockerfile.rpi3 b/internal/docker/rpi/Dockerfile.rpi3 index 3962b7e7a..557e63ad1 100644 --- a/internal/docker/rpi/Dockerfile.rpi3 +++ b/internal/docker/rpi/Dockerfile.rpi3 @@ -13,6 +13,6 @@ RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check rpi3 RUN $GOPATH/bin/qtsetup generate rpi3 RUN $GOPATH/bin/qtsetup install rpi3 -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build rpi3 && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build rpi3 && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/sailfish/Dockerfile b/internal/docker/sailfish/Dockerfile index 06de311e0..c0af1fe68 100644 --- a/internal/docker/sailfish/Dockerfile +++ b/internal/docker/sailfish/Dockerfile @@ -6,7 +6,7 @@ ENV GOPATH $HOME/work RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git RUN GO=go1.13.4.linux-386.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local -RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/... +RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... FROM i386/ubuntu:14.04 @@ -23,7 +23,7 @@ ENV QT_SAILFISH_VERSION 2.2.1.18 COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin -COPY --from=base $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl p7zip-full && apt-get -qq clean RUN apt-get -qq update && apt-get -y -qq purge python && apt-get -qq clean @@ -79,10 +79,10 @@ RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup generate sailfish RUN $GOPATH/bin/qtsetup install sailfish -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/sailfish/listview && $GOPATH/bin/qtdeploy build sailfish && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/sailfish/listview && $GOPATH/bin/qtdeploy build sailfish && rm -rf ./deploy RUN $GOPATH/bin/qtsetup generate sailfish-emulator RUN $GOPATH/bin/qtsetup install sailfish-emulator -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/sailfish/listview && $GOPATH/bin/qtdeploy build sailfish-emulator && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/sailfish/listview && $GOPATH/bin/qtdeploy build sailfish-emulator && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates pkg-config \ No newline at end of file diff --git a/internal/docker/ubports/Dockerfile.64_vivid b/internal/docker/ubports/Dockerfile.64_vivid index 943f83fa1..a3d4657e1 100644 --- a/internal/docker/ubports/Dockerfile.64_vivid +++ b/internal/docker/ubports/Dockerfile.64_vivid @@ -14,7 +14,7 @@ ENV QT_UBPORTS_VERSION vivid RUN rm -rf /usr/local/go || true COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install qt*5-doc-html && apt-get -qq clean @@ -22,6 +22,6 @@ RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check ubports RUN $GOPATH/bin/qtsetup generate ubports RUN $GOPATH/bin/qtsetup install ubports -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/ubports/view && $GOPATH/bin/qtdeploy build ubports && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/ubports/view && $GOPATH/bin/qtdeploy build ubports && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/ubports/Dockerfile.64_xenial b/internal/docker/ubports/Dockerfile.64_xenial index c6eb309b0..2cd0541b1 100644 --- a/internal/docker/ubports/Dockerfile.64_xenial +++ b/internal/docker/ubports/Dockerfile.64_xenial @@ -14,12 +14,12 @@ ENV QT_UBPORTS_VERSION xenial RUN rm -rf /usr/local/go || true COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check ubports RUN $GOPATH/bin/qtsetup generate ubports RUN $GOPATH/bin/qtsetup install ubports -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/ubports/view && $GOPATH/bin/qtdeploy build ubports && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/ubports/view && $GOPATH/bin/qtdeploy build ubports && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/ubports/Dockerfile.arm_vivid b/internal/docker/ubports/Dockerfile.arm_vivid index 7ff060447..7297886a0 100644 --- a/internal/docker/ubports/Dockerfile.arm_vivid +++ b/internal/docker/ubports/Dockerfile.arm_vivid @@ -14,7 +14,7 @@ ENV QT_UBPORTS_VERSION vivid RUN rm -rf /usr/local/go || true COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install qt*5-doc-html && apt-get -qq clean @@ -25,6 +25,6 @@ RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check ubports RUN $GOPATH/bin/qtsetup generate ubports || true RUN $GOPATH/bin/qtsetup install ubports -#RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/ubports/view && $GOPATH/bin/qtdeploy build ubports && rm -rf ./deploy +#RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/ubports/view && $GOPATH/bin/qtdeploy build ubports && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/ubports/Dockerfile.arm_xenial b/internal/docker/ubports/Dockerfile.arm_xenial index 129650d36..1dcbaa0ab 100644 --- a/internal/docker/ubports/Dockerfile.arm_xenial +++ b/internal/docker/ubports/Dockerfile.arm_xenial @@ -14,7 +14,7 @@ ENV QT_UBPORTS_VERSION xenial RUN rm -rf /usr/local/go || true COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN ln -s /usr/lib/arm-linux-gnueabihf/qt5/qt.conf /usr/lib/qt5/bin/ @@ -22,6 +22,6 @@ RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check ubports RUN $GOPATH/bin/qtsetup generate ubports RUN $GOPATH/bin/qtsetup install ubports -#RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/ubports/view && $GOPATH/bin/qtdeploy build ubports && rm -rf ./deploy +#RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/ubports/view && $GOPATH/bin/qtdeploy build ubports && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/windows_32_shared/Dockerfile b/internal/docker/windows_32_shared/Dockerfile index 5f667cf50..44fe4e2a5 100644 --- a/internal/docker/windows_32_shared/Dockerfile +++ b/internal/docker/windows_32_shared/Dockerfile @@ -12,13 +12,13 @@ ENV QT_MXE_STATIC false COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt COPY --from=therecipe/qt:windows_32_shared_base /usr/lib/mxe /usr/lib/mxe RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check windows RUN $GOPATH/bin/qtsetup generate windows RUN $GOPATH/bin/qtsetup install windows -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build windows && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build windows && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/windows_32_static/Dockerfile b/internal/docker/windows_32_static/Dockerfile index 6a91066c2..d1114ee30 100644 --- a/internal/docker/windows_32_static/Dockerfile +++ b/internal/docker/windows_32_static/Dockerfile @@ -12,13 +12,13 @@ ENV QT_MXE_STATIC true COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt COPY --from=therecipe/qt:windows_32_static_base /usr/lib/mxe /usr/lib/mxe RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check windows RUN $GOPATH/bin/qtsetup generate windows RUN $GOPATH/bin/qtsetup install windows -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build windows && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build windows && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/windows_64_shared/Dockerfile b/internal/docker/windows_64_shared/Dockerfile index 7ae80aa45..127f0523b 100644 --- a/internal/docker/windows_64_shared/Dockerfile +++ b/internal/docker/windows_64_shared/Dockerfile @@ -12,13 +12,13 @@ ENV QT_MXE_STATIC false COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt COPY --from=therecipe/qt:windows_64_shared_base /usr/lib/mxe /usr/lib/mxe RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check windows RUN $GOPATH/bin/qtsetup generate windows RUN $GOPATH/bin/qtsetup install windows -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build windows && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build windows && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/windows_64_static/Dockerfile b/internal/docker/windows_64_static/Dockerfile index f7d20c401..673e2a1a0 100644 --- a/internal/docker/windows_64_static/Dockerfile +++ b/internal/docker/windows_64_static/Dockerfile @@ -12,13 +12,13 @@ ENV QT_MXE_STATIC true COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt COPY --from=therecipe/qt:windows_64_static_base /usr/lib/mxe /usr/lib/mxe RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check windows RUN $GOPATH/bin/qtsetup generate windows RUN $GOPATH/bin/qtsetup install windows -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build windows && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && $GOPATH/bin/qtdeploy build windows && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/windows_legacy/Dockerfile.32_shared b/internal/docker/windows_legacy/Dockerfile.32_shared index 90521ce37..5a221c0b8 100644 --- a/internal/docker/windows_legacy/Dockerfile.32_shared +++ b/internal/docker/windows_legacy/Dockerfile.32_shared @@ -18,13 +18,13 @@ ENV QT_MXE_STATIC false COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt COPY --from=base /usr/lib/mxe /usr/lib/mxe RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check windows RUN $GOPATH/bin/qtsetup generate windows RUN $GOPATH/bin/qtsetup install windows -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build windows && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build windows && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/windows_legacy/Dockerfile.32_static b/internal/docker/windows_legacy/Dockerfile.32_static index e104046a9..a4926c8fd 100644 --- a/internal/docker/windows_legacy/Dockerfile.32_static +++ b/internal/docker/windows_legacy/Dockerfile.32_static @@ -18,13 +18,13 @@ ENV QT_MXE_STATIC true COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt COPY --from=base /usr/lib/mxe /usr/lib/mxe RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check windows RUN $GOPATH/bin/qtsetup generate windows RUN $GOPATH/bin/qtsetup install windows -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build windows && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build windows && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/windows_legacy/Dockerfile.64_shared b/internal/docker/windows_legacy/Dockerfile.64_shared index ab183227b..9d162f05e 100644 --- a/internal/docker/windows_legacy/Dockerfile.64_shared +++ b/internal/docker/windows_legacy/Dockerfile.64_shared @@ -18,13 +18,13 @@ ENV QT_MXE_STATIC false COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt COPY --from=base /usr/lib/mxe /usr/lib/mxe RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check windows RUN $GOPATH/bin/qtsetup generate windows RUN $GOPATH/bin/qtsetup install windows -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build windows && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build windows && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/windows_legacy/Dockerfile.64_static b/internal/docker/windows_legacy/Dockerfile.64_static index e2792e5f1..2eadd375c 100644 --- a/internal/docker/windows_legacy/Dockerfile.64_static +++ b/internal/docker/windows_legacy/Dockerfile.64_static @@ -18,13 +18,13 @@ ENV QT_MXE_STATIC true COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt +COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt COPY --from=base /usr/lib/mxe /usr/lib/mxe RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check windows RUN $GOPATH/bin/qtsetup generate windows RUN $GOPATH/bin/qtsetup install windows -RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build windows && rm -rf ./deploy +RUN cd $GOPATH/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && $GOPATH/bin/qtdeploy build windows && rm -rf ./deploy RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config \ No newline at end of file diff --git a/internal/docker/wine/Dockerfile b/internal/docker/wine/Dockerfile index 3629043d6..e7704cf1e 100644 --- a/internal/docker/wine/Dockerfile +++ b/internal/docker/wine/Dockerfile @@ -20,7 +20,7 @@ ENV WINEPATH C:\\go\\bin COPY --from=base $HOME/.wine/drive_c/go $HOME/.wine/drive_c/go COPY --from=base $HOME/.wine/drive_c/gopath/bin $HOME/.wine/drive_c/gopath/bin -COPY --from=base $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt +COPY --from=base $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt COPY --from=base $HOME/.wine/drive_c/Qt/Qt5.13.0/5.13.0/mingw73_64 $HOME/.wine/drive_c/Qt/Qt5.13.0/5.13.0/mingw73_64 COPY --from=base $HOME/.wine/drive_c/Qt/Qt5.13.0/Docs $HOME/.wine/drive_c/Qt/Qt5.13.0/Docs COPY --from=base $HOME/.wine/drive_c/Qt/Qt5.13.0/Licenses $HOME/.wine/drive_c/Qt/Qt5.13.0/Licenses @@ -41,7 +41,7 @@ RUN echo 'REGEDIT4\n\n\ RUN wine $GOPATH\\bin\\qtsetup prep RUN wine $GOPATH\\bin\\qtsetup check RUN wine $GOPATH\\bin\\qtsetup generate -RUN cd $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && wine qtdeploy build && rm -rf ./deploy +RUN cd $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && wine qtdeploy build && rm -rf ./deploy RUN echo "#!/bin/bash\nexport GOPATH=\$(winepath -0 -w \$(echo \$GOPATH | sed -e 's/:/ /g') | sed -e 's/Z:/;Z:/2g')" > /usr/bin/qtpath && chmod +x /usr/bin/qtpath RUN echo '#!/bin/bash\nsource qtpath\nwine qtdeploy "$@"' > /usr/bin/qtdeploy && chmod +x /usr/bin/qtdeploy diff --git a/internal/docker/wine/Dockerfile.32 b/internal/docker/wine/Dockerfile.32 index 1d57327d6..8f6b1f5a2 100644 --- a/internal/docker/wine/Dockerfile.32 +++ b/internal/docker/wine/Dockerfile.32 @@ -21,7 +21,7 @@ ENV WINEPATH C:\\go\\bin COPY --from=base $HOME/.wine/drive_c/go $HOME/.wine/drive_c/go COPY --from=base $HOME/.wine/drive_c/gopath/bin $HOME/.wine/drive_c/gopath/bin -COPY --from=base $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt +COPY --from=base $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt COPY --from=base $HOME/.wine/drive_c/Qt/Qt5.13.0/5.13.0/mingw73_32 $HOME/.wine/drive_c/Qt/Qt5.13.0/5.13.0/mingw73_32 COPY --from=base $HOME/.wine/drive_c/Qt/Qt5.13.0/Docs $HOME/.wine/drive_c/Qt/Qt5.13.0/Docs COPY --from=base $HOME/.wine/drive_c/Qt/Qt5.13.0/Licenses $HOME/.wine/drive_c/Qt/Qt5.13.0/Licenses @@ -42,7 +42,7 @@ RUN echo 'REGEDIT4\n\n\ RUN wine $GOPATH\\bin\\qtsetup prep RUN wine $GOPATH\\bin\\qtsetup check RUN wine $GOPATH\\bin\\qtsetup generate -RUN cd $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && wine qtdeploy build && rm -rf ./deploy +RUN cd $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && wine qtdeploy build && rm -rf ./deploy RUN echo "#!/bin/bash\nexport GOPATH=\$(winepath -0 -w \$(echo \$GOPATH | sed -e 's/:/ /g') | sed -e 's/Z:/;Z:/2g')" > /usr/bin/qtpath && chmod +x /usr/bin/qtpath RUN echo '#!/bin/bash\nsource qtpath\nwine qtdeploy "$@"' > /usr/bin/qtdeploy && chmod +x /usr/bin/qtdeploy diff --git a/internal/docker/wine/Dockerfile.32_shared b/internal/docker/wine/Dockerfile.32_shared index ebe244413..12635e9fe 100644 --- a/internal/docker/wine/Dockerfile.32_shared +++ b/internal/docker/wine/Dockerfile.32_shared @@ -81,7 +81,7 @@ ENV WINEPATH C:\\mingw32\\bin;C:\\go\\bin COPY --from=base $HOME/.wine/drive_c/go $HOME/.wine/drive_c/go COPY --from=base $HOME/.wine/drive_c/gopath/bin $HOME/.wine/drive_c/gopath/bin -COPY --from=base $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt +COPY --from=base $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt COPY --from=base $HOME/.wine/drive_c/mingw32 $HOME/.wine/drive_c/mingw32 COPY --from=base $HOME/.wine/drive_c/msys64/mingw32/bin $HOME/.wine/drive_c/msys64/mingw32/bin COPY --from=base $HOME/.wine/drive_c/msys64/mingw32/include $HOME/.wine/drive_c/msys64/mingw32/include @@ -107,7 +107,7 @@ RUN echo 'REGEDIT4\n\n\ RUN wine $GOPATH\\bin\\qtsetup prep RUN wine $GOPATH\\bin\\qtsetup check RUN wine $GOPATH\\bin\\qtsetup generate -RUN cd $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && wine qtdeploy build && rm -rf ./deploy +RUN cd $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && wine qtdeploy build && rm -rf ./deploy RUN echo "#!/bin/bash\nexport GOPATH=\$(winepath -0 -w \$(echo \$GOPATH | sed -e 's/:/ /g') | sed -e 's/Z:/;Z:/2g')" > /usr/bin/qtpath && chmod +x /usr/bin/qtpath RUN echo '#!/bin/bash\nsource qtpath\nwine qtdeploy "$@"' > /usr/bin/qtdeploy && chmod +x /usr/bin/qtdeploy diff --git a/internal/docker/wine/Dockerfile.32_static b/internal/docker/wine/Dockerfile.32_static index 3f9bcb867..974361678 100644 --- a/internal/docker/wine/Dockerfile.32_static +++ b/internal/docker/wine/Dockerfile.32_static @@ -88,7 +88,7 @@ ENV WINEPATH C:\\mingw32\\bin;C:\\go\\bin COPY --from=base $HOME/.wine/drive_c/go $HOME/.wine/drive_c/go COPY --from=base $HOME/.wine/drive_c/gopath/bin $HOME/.wine/drive_c/gopath/bin -COPY --from=base $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt +COPY --from=base $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt COPY --from=base $HOME/.wine/drive_c/mingw32 $HOME/.wine/drive_c/mingw32 COPY --from=base $HOME/.wine/drive_c/msys64/mingw32/qt5-static/bin $HOME/.wine/drive_c/msys64/mingw32/qt5-static/bin @@ -124,7 +124,7 @@ RUN echo 'REGEDIT4\n\n\ RUN wine $GOPATH\\bin\\qtsetup prep RUN wine $GOPATH\\bin\\qtsetup check RUN wine $GOPATH\\bin\\qtsetup generate -RUN cd $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && wine qtdeploy build && rm -rf ./deploy +RUN cd $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && wine qtdeploy build && rm -rf ./deploy RUN echo "#!/bin/bash\nexport GOPATH=\$(winepath -0 -w \$(echo \$GOPATH | sed -e 's/:/ /g') | sed -e 's/Z:/;Z:/2g')" > /usr/bin/qtpath && chmod +x /usr/bin/qtpath RUN echo '#!/bin/bash\nsource qtpath\nwine qtdeploy "$@"' > /usr/bin/qtdeploy && chmod +x /usr/bin/qtdeploy diff --git a/internal/docker/wine/Dockerfile.512 b/internal/docker/wine/Dockerfile.512 index 08a2c6b6a..30058b444 100644 --- a/internal/docker/wine/Dockerfile.512 +++ b/internal/docker/wine/Dockerfile.512 @@ -20,7 +20,7 @@ ENV WINEPATH C:\\go\\bin COPY --from=base $HOME/.wine/drive_c/go $HOME/.wine/drive_c/go COPY --from=base $HOME/.wine/drive_c/gopath/bin $HOME/.wine/drive_c/gopath/bin -COPY --from=base $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt +COPY --from=base $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt COPY --from=base $HOME/.wine/drive_c/Qt/Qt5.12.4/5.12.4/mingw73_64 $HOME/.wine/drive_c/Qt/Qt5.12.4/5.12.4/mingw73_64 COPY --from=base $HOME/.wine/drive_c/Qt/Qt5.12.4/Docs $HOME/.wine/drive_c/Qt/Qt5.12.4/Docs COPY --from=base $HOME/.wine/drive_c/Qt/Qt5.12.4/Licenses $HOME/.wine/drive_c/Qt/Qt5.12.4/Licenses @@ -42,7 +42,7 @@ RUN echo 'REGEDIT4\n\n\ RUN wine $GOPATH\\bin\\qtsetup prep RUN wine $GOPATH\\bin\\qtsetup check RUN wine $GOPATH\\bin\\qtsetup generate -RUN cd $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && wine qtdeploy build && rm -rf ./deploy +RUN cd $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && wine qtdeploy build && rm -rf ./deploy RUN echo "#!/bin/bash\nexport GOPATH=\$(winepath -0 -w \$(echo \$GOPATH | sed -e 's/:/ /g') | sed -e 's/Z:/;Z:/2g')" > /usr/bin/qtpath && chmod +x /usr/bin/qtpath RUN echo '#!/bin/bash\nsource qtpath\nwine qtdeploy "$@"' > /usr/bin/qtdeploy && chmod +x /usr/bin/qtdeploy diff --git a/internal/docker/wine/Dockerfile.56 b/internal/docker/wine/Dockerfile.56 index 0503d038d..7ded0605b 100644 --- a/internal/docker/wine/Dockerfile.56 +++ b/internal/docker/wine/Dockerfile.56 @@ -21,7 +21,7 @@ ENV WINEPATH C:\\go\\bin COPY --from=base $HOME/.wine/drive_c/go $HOME/.wine/drive_c/go COPY --from=base $HOME/.wine/drive_c/gopath/bin $HOME/.wine/drive_c/gopath/bin -COPY --from=base $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt +COPY --from=base $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt COPY --from=base $HOME/.wine/drive_c/Qt/Qt5.6.3/5.6.3/mingw49_32 $HOME/.wine/drive_c/Qt/Qt5.6.3/5.6.3/mingw49_32 COPY --from=base $HOME/.wine/drive_c/Qt/Qt5.6.3/Docs $HOME/.wine/drive_c/Qt/Qt5.6.3/Docs COPY --from=base $HOME/.wine/drive_c/Qt/Qt5.6.3/Tools/mingw492_32 $HOME/.wine/drive_c/Qt/Qt5.6.3/Tools/mingw492_32 @@ -42,7 +42,7 @@ RUN echo 'REGEDIT4\n\n\ RUN wine $GOPATH\\bin\\qtsetup prep RUN wine $GOPATH\\bin\\qtsetup check RUN wine $GOPATH\\bin\\qtsetup generate -RUN cd $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && wine qtdeploy build && rm -rf ./deploy +RUN cd $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && wine qtdeploy build && rm -rf ./deploy RUN echo "#!/bin/bash\nexport GOPATH=\$(winepath -0 -w \$(echo \$GOPATH | sed -e 's/:/ /g') | sed -e 's/Z:/;Z:/2g')" > /usr/bin/qtpath && chmod +x /usr/bin/qtpath RUN echo '#!/bin/bash\nsource qtpath\nwine qtdeploy "$@"' > /usr/bin/qtdeploy && chmod +x /usr/bin/qtdeploy diff --git a/internal/docker/wine/Dockerfile.56_xp b/internal/docker/wine/Dockerfile.56_xp index 4e912ebc6..49b863521 100644 --- a/internal/docker/wine/Dockerfile.56_xp +++ b/internal/docker/wine/Dockerfile.56_xp @@ -21,7 +21,7 @@ ENV WINEPATH C:\\go\\bin COPY --from=base $HOME/.wine/drive_c/go $HOME/.wine/drive_c/go COPY --from=base $HOME/.wine/drive_c/gopath/bin $HOME/.wine/drive_c/gopath/bin -COPY --from=base $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt +COPY --from=base $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt COPY --from=base $HOME/.wine/drive_c/Qt/Qt5.6.3/5.6.3/mingw49_32 $HOME/.wine/drive_c/Qt/Qt5.6.3/5.6.3/mingw49_32 COPY --from=base $HOME/.wine/drive_c/Qt/Qt5.6.3/Docs $HOME/.wine/drive_c/Qt/Qt5.6.3/Docs COPY --from=base $HOME/.wine/drive_c/Qt/Qt5.6.3/Tools/mingw492_32 $HOME/.wine/drive_c/Qt/Qt5.6.3/Tools/mingw492_32 @@ -42,7 +42,7 @@ RUN echo 'REGEDIT4\n\n\ RUN wine $GOPATH\\bin\\qtsetup prep RUN wine $GOPATH\\bin\\qtsetup check RUN wine $GOPATH\\bin\\qtsetup generate -RUN cd $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && wine qtdeploy build && rm -rf ./deploy +RUN cd $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && wine qtdeploy build && rm -rf ./deploy RUN echo "#!/bin/bash\nexport GOPATH=\$(winepath -0 -w \$(echo \$GOPATH | sed -e 's/:/ /g') | sed -e 's/Z:/;Z:/2g')" > /usr/bin/qtpath && chmod +x /usr/bin/qtpath RUN echo '#!/bin/bash\nsource qtpath\nwine qtdeploy "$@"' > /usr/bin/qtdeploy && chmod +x /usr/bin/qtdeploy diff --git a/internal/docker/wine/Dockerfile.59 b/internal/docker/wine/Dockerfile.59 index 17508074d..1e96bad04 100644 --- a/internal/docker/wine/Dockerfile.59 +++ b/internal/docker/wine/Dockerfile.59 @@ -20,7 +20,7 @@ ENV WINEPATH C:\\go\\bin COPY --from=base $HOME/.wine/drive_c/go $HOME/.wine/drive_c/go COPY --from=base $HOME/.wine/drive_c/gopath/bin $HOME/.wine/drive_c/gopath/bin -COPY --from=base $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt +COPY --from=base $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt COPY --from=base $HOME/.wine/drive_c/Qt/Qt5.9.6/5.9.6/mingw53_32 $HOME/.wine/drive_c/Qt/Qt5.9.6/5.9.6/mingw53_32 COPY --from=base $HOME/.wine/drive_c/Qt/Qt5.9.6/Docs $HOME/.wine/drive_c/Qt/Qt5.9.6/Docs COPY --from=base $HOME/.wine/drive_c/Qt/Qt5.9.6/Tools/mingw530_32 $HOME/.wine/drive_c/Qt/Qt5.9.6/Tools/mingw530_32 @@ -41,7 +41,7 @@ RUN echo 'REGEDIT4\n\n\ RUN wine $GOPATH\\bin\\qtsetup prep RUN wine $GOPATH\\bin\\qtsetup check RUN wine $GOPATH\\bin\\qtsetup generate -RUN cd $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && wine qtdeploy build && rm -rf ./deploy +RUN cd $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && wine qtdeploy build && rm -rf ./deploy RUN echo "#!/bin/bash\nexport GOPATH=\$(winepath -0 -w \$(echo \$GOPATH | sed -e 's/:/ /g') | sed -e 's/Z:/;Z:/2g')" > /usr/bin/qtpath && chmod +x /usr/bin/qtpath RUN echo '#!/bin/bash\nsource qtpath\nwine qtdeploy "$@"' > /usr/bin/qtdeploy && chmod +x /usr/bin/qtdeploy diff --git a/internal/docker/wine/Dockerfile.64_msvc b/internal/docker/wine/Dockerfile.64_msvc index 5cf468bbc..c5fa9d2d9 100644 --- a/internal/docker/wine/Dockerfile.64_msvc +++ b/internal/docker/wine/Dockerfile.64_msvc @@ -32,7 +32,7 @@ ENV WINEPATH C:\\go\\bin COPY --from=base $HOME/.wine/drive_c/go $HOME/.wine/drive_c/go COPY --from=base $HOME/.wine/drive_c/gopath/bin $HOME/.wine/drive_c/gopath/bin -COPY --from=base $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt +COPY --from=base $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt COPY --from=base $HOME/.wine/drive_c/Qt/Qt5.13.0/5.13.0/msvc2017_64 $HOME/.wine/drive_c/Qt/Qt5.13.0/5.13.0/msvc2017_64 COPY --from=base $HOME/.wine/drive_c/Qt/Qt5.13.0/Docs $HOME/.wine/drive_c/Qt/Qt5.13.0/Docs COPY --from=base $HOME/.wine/drive_c/Qt/Qt5.13.0/Licenses $HOME/.wine/drive_c/Qt/Qt5.13.0/Licenses @@ -56,7 +56,7 @@ RUN echo 'REGEDIT4\n\n\ RUN wine $GOPATH\\bin\\qtsetup prep RUN wine $GOPATH\\bin\\qtsetup check RUN wine $GOPATH\\bin\\qtsetup generate -RUN cd $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && wine qtdeploy build && rm -rf ./deploy +RUN cd $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && wine qtdeploy build && rm -rf ./deploy RUN echo "#!/bin/bash\nexport GOPATH=\$(winepath -0 -w \$(echo \$GOPATH | sed -e 's/:/ /g') | sed -e 's/Z:/;Z:/2g')" > /usr/bin/qtpath && chmod +x /usr/bin/qtpath RUN echo '#!/bin/bash\nsource qtpath\nwine qtdeploy "$@"' > /usr/bin/qtdeploy && chmod +x /usr/bin/qtdeploy diff --git a/internal/docker/wine/Dockerfile.64_shared b/internal/docker/wine/Dockerfile.64_shared index fe76b097a..70a774f42 100644 --- a/internal/docker/wine/Dockerfile.64_shared +++ b/internal/docker/wine/Dockerfile.64_shared @@ -81,7 +81,7 @@ ENV WINEPATH C:\\mingw64\\bin;C:\\go\\bin COPY --from=base $HOME/.wine/drive_c/go $HOME/.wine/drive_c/go COPY --from=base $HOME/.wine/drive_c/gopath/bin $HOME/.wine/drive_c/gopath/bin -COPY --from=base $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt +COPY --from=base $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt COPY --from=base $HOME/.wine/drive_c/mingw64 $HOME/.wine/drive_c/mingw64 COPY --from=base $HOME/.wine/drive_c/msys64/mingw64/bin $HOME/.wine/drive_c/msys64/mingw64/bin COPY --from=base $HOME/.wine/drive_c/msys64/mingw64/include $HOME/.wine/drive_c/msys64/mingw64/include @@ -107,7 +107,7 @@ RUN echo 'REGEDIT4\n\n\ RUN wine $GOPATH\\bin\\qtsetup prep RUN wine $GOPATH\\bin\\qtsetup check RUN wine $GOPATH\\bin\\qtsetup generate -RUN cd $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && wine qtdeploy build && rm -rf ./deploy +RUN cd $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && wine qtdeploy build && rm -rf ./deploy RUN echo "#!/bin/bash\nexport GOPATH=\$(winepath -0 -w \$(echo \$GOPATH | sed -e 's/:/ /g') | sed -e 's/Z:/;Z:/2g')" > /usr/bin/qtpath && chmod +x /usr/bin/qtpath RUN echo '#!/bin/bash\nsource qtpath\nwine qtdeploy "$@"' > /usr/bin/qtdeploy && chmod +x /usr/bin/qtdeploy diff --git a/internal/docker/wine/Dockerfile.64_static b/internal/docker/wine/Dockerfile.64_static index 11e6f6ca2..240f98d47 100644 --- a/internal/docker/wine/Dockerfile.64_static +++ b/internal/docker/wine/Dockerfile.64_static @@ -88,7 +88,7 @@ ENV WINEPATH C:\\mingw64\\bin;C:\\go\\bin COPY --from=base $HOME/.wine/drive_c/go $HOME/.wine/drive_c/go COPY --from=base $HOME/.wine/drive_c/gopath/bin $HOME/.wine/drive_c/gopath/bin -COPY --from=base $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt +COPY --from=base $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt COPY --from=base $HOME/.wine/drive_c/mingw64 $HOME/.wine/drive_c/mingw64 COPY --from=base $HOME/.wine/drive_c/msys64/mingw64/qt5-static/bin $HOME/.wine/drive_c/msys64/mingw64/qt5-static/bin @@ -124,7 +124,7 @@ RUN echo 'REGEDIT4\n\n\ RUN wine $GOPATH\\bin\\qtsetup prep RUN wine $GOPATH\\bin\\qtsetup check RUN wine $GOPATH\\bin\\qtsetup generate -RUN cd $HOME/.wine/drive_c/gopath/src/github.com/therecipe/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && wine qtdeploy build && rm -rf ./deploy +RUN cd $HOME/.wine/drive_c/gopath/src/github.com/StarAurryon/qt/internal/examples/widgets/line_edits && sed -i -e 's/AddWidget2/AddWidget/g' line_edits.go && wine qtdeploy build && rm -rf ./deploy RUN echo "#!/bin/bash\nexport GOPATH=\$(winepath -0 -w \$(echo \$GOPATH | sed -e 's/:/ /g') | sed -e 's/Z:/;Z:/2g')" > /usr/bin/qtpath && chmod +x /usr/bin/qtpath RUN echo '#!/bin/bash\nsource qtpath\nwine qtdeploy "$@"' > /usr/bin/qtdeploy && chmod +x /usr/bin/qtdeploy diff --git a/internal/docker/wine/Dockerfile.base b/internal/docker/wine/Dockerfile.base index 60ac4abbd..d3a7a7c32 100644 --- a/internal/docker/wine/Dockerfile.base +++ b/internal/docker/wine/Dockerfile.base @@ -8,7 +8,7 @@ ENV WINEDEBUG -all RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git && apt-get -qq clean RUN GO=go1.13.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local && rm -f $GO -RUN GOOS=windows /usr/local/go/bin/go get -d -tags=no_env github.com/therecipe/qt/cmd/... +RUN GOOS=windows /usr/local/go/bin/go get -d -tags=no_env github.com/StarAurryon/qt/cmd/... RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install software-properties-common apt-transport-https && apt-get -qq clean RUN dpkg --add-architecture i386 @@ -21,4 +21,4 @@ RUN curl -sL --retry 10 --retry-delay 60 -O https://raw.githubusercontent.com/Wi RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install unzip && apt-get -qq clean RUN GO=go1.11.9.windows-amd64.zip && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && unzip -qq $GO -d $HOME/.wine/drive_c && rm -f $GO -RUN GOPATH=C:\\gopath wine C:\\go\\bin\\go install -ldflags="-s -w" -tags=no_env github.com/therecipe/qt/cmd/... +RUN GOPATH=C:\\gopath wine C:\\go\\bin\\go install -ldflags="-s -w" -tags=no_env github.com/StarAurryon/qt/cmd/... diff --git a/internal/docker/wine/Dockerfile.base_xp b/internal/docker/wine/Dockerfile.base_xp index debcb4cb3..503b8b9ed 100644 --- a/internal/docker/wine/Dockerfile.base_xp +++ b/internal/docker/wine/Dockerfile.base_xp @@ -8,7 +8,7 @@ ENV WINEDEBUG -all RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git && apt-get -qq clean RUN GO=go1.13.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local && rm -f $GO -RUN GOOS=windows /usr/local/go/bin/go get -d -tags=no_env github.com/therecipe/qt/cmd/... +RUN GOOS=windows /usr/local/go/bin/go get -d -tags=no_env github.com/StarAurryon/qt/cmd/... RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install software-properties-common apt-transport-https && apt-get -qq clean RUN dpkg --add-architecture i386 @@ -21,4 +21,4 @@ RUN curl -sL --retry 10 --retry-delay 60 -O https://raw.githubusercontent.com/Wi RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install unzip && apt-get -qq clean RUN GO=go1.10.8.windows-amd64.zip && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && unzip -qq $GO -d $HOME/.wine/drive_c && rm -f $GO -RUN GOPATH=C:\\gopath wine C:\\go\\bin\\go install -ldflags="-s -w" -tags=no_env github.com/therecipe/qt/cmd/... +RUN GOPATH=C:\\gopath wine C:\\go\\bin\\go install -ldflags="-s -w" -tags=no_env github.com/StarAurryon/qt/cmd/... diff --git a/internal/examples/3rdparty/fluid/demo/main.go b/internal/examples/3rdparty/fluid/demo/main.go index 065f71e08..d8fdcccdf 100644 --- a/internal/examples/3rdparty/fluid/demo/main.go +++ b/internal/examples/3rdparty/fluid/demo/main.go @@ -5,10 +5,10 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/quickcontrols2" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/quickcontrols2" ) func main() { diff --git a/internal/examples/3rdparty/kirigami/demo/demo/main.go b/internal/examples/3rdparty/kirigami/demo/demo/main.go index 83a9b58af..9feacc6c6 100644 --- a/internal/examples/3rdparty/kirigami/demo/demo/main.go +++ b/internal/examples/3rdparty/kirigami/demo/demo/main.go @@ -5,10 +5,10 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/quickcontrols2" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/quickcontrols2" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/3rdparty/printslides/cmd/printslides/printslides.go b/internal/examples/3rdparty/printslides/cmd/printslides/printslides.go index f8dd15414..ce15fa1a0 100644 --- a/internal/examples/3rdparty/printslides/cmd/printslides/printslides.go +++ b/internal/examples/3rdparty/printslides/cmd/printslides/printslides.go @@ -7,8 +7,8 @@ import ( "os" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" ) func main() { diff --git a/internal/examples/3rdparty/printslides/cmd/printslides/slideview.go b/internal/examples/3rdparty/printslides/cmd/printslides/slideview.go index 7e6877737..b0d6a5682 100644 --- a/internal/examples/3rdparty/printslides/cmd/printslides/slideview.go +++ b/internal/examples/3rdparty/printslides/cmd/printslides/slideview.go @@ -5,10 +5,10 @@ import ( "os" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/printsupport" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/printsupport" + "github.com/StarAurryon/qt/quick" ) type SlideView struct { diff --git a/internal/examples/3rdparty/qml-material/demo/main.go b/internal/examples/3rdparty/qml-material/demo/main.go index 7f913d406..501649c0c 100644 --- a/internal/examples/3rdparty/qml-material/demo/main.go +++ b/internal/examples/3rdparty/qml-material/demo/main.go @@ -5,12 +5,12 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/quickcontrols2" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/quickcontrols2" - _ "github.com/therecipe/qt/internal/examples/3rdparty/qml-material/demo/icons" + _ "github.com/StarAurryon/qt/internal/examples/3rdparty/qml-material/demo/icons" ) func main() { diff --git a/internal/examples/3rdparty/quickflux/demo/middleware/main.go b/internal/examples/3rdparty/quickflux/demo/middleware/main.go index a784bc9d3..3306190b3 100644 --- a/internal/examples/3rdparty/quickflux/demo/middleware/main.go +++ b/internal/examples/3rdparty/quickflux/demo/middleware/main.go @@ -5,11 +5,11 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/qml" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/qml" - _ "github.com/therecipe/qt/internal/examples/3rdparty/quickflux/quickflux" + _ "github.com/StarAurryon/qt/internal/examples/3rdparty/quickflux/quickflux" ) func main() { diff --git a/internal/examples/3rdparty/quickflux/demo/photoalbum/main.go b/internal/examples/3rdparty/quickflux/demo/photoalbum/main.go index a784bc9d3..3306190b3 100644 --- a/internal/examples/3rdparty/quickflux/demo/photoalbum/main.go +++ b/internal/examples/3rdparty/quickflux/demo/photoalbum/main.go @@ -5,11 +5,11 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/qml" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/qml" - _ "github.com/therecipe/qt/internal/examples/3rdparty/quickflux/quickflux" + _ "github.com/StarAurryon/qt/internal/examples/3rdparty/quickflux/quickflux" ) func main() { diff --git a/internal/examples/3rdparty/quickflux/demo/todo/main.go b/internal/examples/3rdparty/quickflux/demo/todo/main.go index a784bc9d3..3306190b3 100644 --- a/internal/examples/3rdparty/quickflux/demo/todo/main.go +++ b/internal/examples/3rdparty/quickflux/demo/todo/main.go @@ -5,11 +5,11 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/qml" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/qml" - _ "github.com/therecipe/qt/internal/examples/3rdparty/quickflux/quickflux" + _ "github.com/StarAurryon/qt/internal/examples/3rdparty/quickflux/quickflux" ) func main() { diff --git a/internal/examples/3rdparty/quickflux/init.go b/internal/examples/3rdparty/quickflux/init.go index 256688136..37e7d2bd6 100644 --- a/internal/examples/3rdparty/quickflux/init.go +++ b/internal/examples/3rdparty/quickflux/init.go @@ -110,8 +110,8 @@ func main() { const quickflux_stub = `package quickflux import ( - "github.com/therecipe/qt/core" - _ "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + _ "github.com/StarAurryon/qt/quick" ) type quickflux_stub struct { diff --git a/internal/examples/3rdparty/qzxing/demo/BarcodeEncoder/main.go b/internal/examples/3rdparty/qzxing/demo/BarcodeEncoder/main.go index caf25d2b7..7cbc068dc 100644 --- a/internal/examples/3rdparty/qzxing/demo/BarcodeEncoder/main.go +++ b/internal/examples/3rdparty/qzxing/demo/BarcodeEncoder/main.go @@ -5,11 +5,11 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/qml" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/qml" - "github.com/therecipe/qt/internal/examples/3rdparty/qzxing" + "github.com/StarAurryon/qt/internal/examples/3rdparty/qzxing" ) func main() { diff --git a/internal/examples/3rdparty/qzxing/demo/QZXingLive/application.go b/internal/examples/3rdparty/qzxing/demo/QZXingLive/application.go index 27fa13747..2dc063a24 100644 --- a/internal/examples/3rdparty/qzxing/demo/QZXingLive/application.go +++ b/internal/examples/3rdparty/qzxing/demo/QZXingLive/application.go @@ -3,9 +3,9 @@ package main import ( "runtime" - "github.com/therecipe/qt/androidextras" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/qml" + "github.com/StarAurryon/qt/androidextras" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/qml" ) var Application *application diff --git a/internal/examples/3rdparty/qzxing/demo/QZXingLive/main.go b/internal/examples/3rdparty/qzxing/demo/QZXingLive/main.go index 854b3c7ed..8c8d5e065 100644 --- a/internal/examples/3rdparty/qzxing/demo/QZXingLive/main.go +++ b/internal/examples/3rdparty/qzxing/demo/QZXingLive/main.go @@ -5,10 +5,10 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" - "github.com/therecipe/qt/internal/examples/3rdparty/qzxing" + "github.com/StarAurryon/qt/internal/examples/3rdparty/qzxing" ) func main() { diff --git a/internal/examples/3rdparty/qzxing/qzxing.go b/internal/examples/3rdparty/qzxing/qzxing.go index 4cd55bdbc..92dfd59f8 100644 --- a/internal/examples/3rdparty/qzxing/qzxing.go +++ b/internal/examples/3rdparty/qzxing/qzxing.go @@ -17,8 +17,8 @@ package qzxing */ import "C" import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/qml" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/qml" ) type stub struct{ core.QObject } //needed to make QtCore available to qzxing/src/QZXing.h diff --git a/internal/examples/3rdparty/sparkle/main.go b/internal/examples/3rdparty/sparkle/main.go index 12f29960b..9ac410fea 100644 --- a/internal/examples/3rdparty/sparkle/main.go +++ b/internal/examples/3rdparty/sparkle/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/3rdparty/stratifyqml/demo/main.go b/internal/examples/3rdparty/stratifyqml/demo/main.go index d994efb8e..a1efd08e7 100644 --- a/internal/examples/3rdparty/stratifyqml/demo/main.go +++ b/internal/examples/3rdparty/stratifyqml/demo/main.go @@ -5,9 +5,9 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/3rdparty/uglobalhotkey/demo/main.go b/internal/examples/3rdparty/uglobalhotkey/demo/main.go index 18e23b812..7a362f4f3 100644 --- a/internal/examples/3rdparty/uglobalhotkey/demo/main.go +++ b/internal/examples/3rdparty/uglobalhotkey/demo/main.go @@ -3,9 +3,9 @@ package main import ( "os" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/widgets" - "github.com/therecipe/qt/internal/examples/3rdparty/uglobalhotkey/UGlobalHotkey" + "github.com/StarAurryon/qt/internal/examples/3rdparty/uglobalhotkey/UGlobalHotkey" ) func main() { diff --git a/internal/examples/3rdparty/uglobalhotkey/patch/ugh.go b/internal/examples/3rdparty/uglobalhotkey/patch/ugh.go index a86eb9ea5..4dc43711f 100644 --- a/internal/examples/3rdparty/uglobalhotkey/patch/ugh.go +++ b/internal/examples/3rdparty/uglobalhotkey/patch/ugh.go @@ -8,9 +8,9 @@ import ( "runtime" "unsafe" - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/widgets" ) type UGlobalHotkeys struct { diff --git a/internal/examples/3rdparty/uglobalhotkey/patch/ugh_cgo.go b/internal/examples/3rdparty/uglobalhotkey/patch/ugh_cgo.go index 9dea02a66..f007e8719 100644 --- a/internal/examples/3rdparty/uglobalhotkey/patch/ugh_cgo.go +++ b/internal/examples/3rdparty/uglobalhotkey/patch/ugh_cgo.go @@ -14,6 +14,6 @@ package UGlobalHotkey */ import "C" -import "github.com/therecipe/qt/widgets" +import "github.com/StarAurryon/qt/widgets" type stub struct{ widgets.QWidget } diff --git a/internal/examples/3rdparty/winsparkle/main.go b/internal/examples/3rdparty/winsparkle/main.go index 12f29960b..9ac410fea 100644 --- a/internal/examples/3rdparty/winsparkle/main.go +++ b/internal/examples/3rdparty/winsparkle/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/androidextras/jni/jni.go b/internal/examples/androidextras/jni/jni.go index 3933deccd..153e03cdf 100644 --- a/internal/examples/androidextras/jni/jni.go +++ b/internal/examples/androidextras/jni/jni.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/androidextras/jni/runnable.go b/internal/examples/androidextras/jni/runnable.go index f1c639f0c..4c43ed147 100644 --- a/internal/examples/androidextras/jni/runnable.go +++ b/internal/examples/androidextras/jni/runnable.go @@ -4,8 +4,8 @@ import "C" import ( "unsafe" - "github.com/therecipe/qt" - "github.com/therecipe/qt/androidextras" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/androidextras" ) type Runnable struct { diff --git a/internal/examples/androidextras/notification/main.go b/internal/examples/androidextras/notification/main.go index ccc326d07..041fb11ce 100644 --- a/internal/examples/androidextras/notification/main.go +++ b/internal/examples/androidextras/notification/main.go @@ -5,9 +5,9 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func main() { diff --git a/internal/examples/androidextras/notification/notificationclient.go b/internal/examples/androidextras/notification/notificationclient.go index 1dc80e980..f5387c8e3 100644 --- a/internal/examples/androidextras/notification/notificationclient.go +++ b/internal/examples/androidextras/notification/notificationclient.go @@ -1,8 +1,8 @@ package main import ( - "github.com/therecipe/qt/androidextras" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt/androidextras" + "github.com/StarAurryon/qt/core" ) type NotificationClient struct { diff --git a/internal/examples/androidextras/service/main.go b/internal/examples/androidextras/service/main.go index 05dadb5ef..d460ce768 100644 --- a/internal/examples/androidextras/service/main.go +++ b/internal/examples/androidextras/service/main.go @@ -5,8 +5,8 @@ import ( "os" "time" - "github.com/therecipe/qt/androidextras" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/androidextras" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/bluetooth/picturetransfer/filetransfer.go b/internal/examples/bluetooth/picturetransfer/filetransfer.go index 0c0c51d4d..2f53720d6 100644 --- a/internal/examples/bluetooth/picturetransfer/filetransfer.go +++ b/internal/examples/bluetooth/picturetransfer/filetransfer.go @@ -1,8 +1,8 @@ package main import ( - "github.com/therecipe/qt/bluetooth" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt/bluetooth" + "github.com/StarAurryon/qt/core" ) type FileTransfer struct { diff --git a/internal/examples/bluetooth/picturetransfer/main.go b/internal/examples/bluetooth/picturetransfer/main.go index 918da8567..25dfc16cc 100644 --- a/internal/examples/bluetooth/picturetransfer/main.go +++ b/internal/examples/bluetooth/picturetransfer/main.go @@ -6,9 +6,9 @@ import ( "fmt" "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func main() { diff --git a/internal/examples/bluetooth/pingpong/main.go b/internal/examples/bluetooth/pingpong/main.go index cb1b648e1..f6a31cf43 100644 --- a/internal/examples/bluetooth/pingpong/main.go +++ b/internal/examples/bluetooth/pingpong/main.go @@ -3,9 +3,9 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/qml" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/qml" ) func main() { diff --git a/internal/examples/bluetooth/pingpong/pingpong.go b/internal/examples/bluetooth/pingpong/pingpong.go index 162a11d98..1a8b2ec88 100644 --- a/internal/examples/bluetooth/pingpong/pingpong.go +++ b/internal/examples/bluetooth/pingpong/pingpong.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/therecipe/qt/bluetooth" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt/bluetooth" + "github.com/StarAurryon/qt/core" ) const ( diff --git a/internal/examples/bluetooth/scanner/qmlscanner.go b/internal/examples/bluetooth/scanner/qmlscanner.go index d05d34f60..5c9b6b5c3 100644 --- a/internal/examples/bluetooth/scanner/qmlscanner.go +++ b/internal/examples/bluetooth/scanner/qmlscanner.go @@ -5,9 +5,9 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func main() { diff --git a/internal/examples/canvas3d/framebuffer/main.go b/internal/examples/canvas3d/framebuffer/main.go index c37caaf0c..3f976fbb6 100644 --- a/internal/examples/canvas3d/framebuffer/main.go +++ b/internal/examples/canvas3d/framebuffer/main.go @@ -7,9 +7,9 @@ import ( "os" "runtime" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func main() { diff --git a/internal/examples/canvas3d/interaction/main.go b/internal/examples/canvas3d/interaction/main.go index cf55006bb..d1406f7e9 100644 --- a/internal/examples/canvas3d/interaction/main.go +++ b/internal/examples/canvas3d/interaction/main.go @@ -7,9 +7,9 @@ import ( "os" "runtime" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func main() { diff --git a/internal/examples/canvas3d/jsonmodels/main.go b/internal/examples/canvas3d/jsonmodels/main.go index 754f84c99..060624fd1 100644 --- a/internal/examples/canvas3d/jsonmodels/main.go +++ b/internal/examples/canvas3d/jsonmodels/main.go @@ -5,9 +5,9 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/qml" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/qml" ) func main() { diff --git a/internal/examples/canvas3d/quickitemtexture/main.go b/internal/examples/canvas3d/quickitemtexture/main.go index c0196b643..ba8e05920 100644 --- a/internal/examples/canvas3d/quickitemtexture/main.go +++ b/internal/examples/canvas3d/quickitemtexture/main.go @@ -5,9 +5,9 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/qml" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/qml" ) func main() { diff --git a/internal/examples/canvas3d/quickitemtexture_wear/main.go b/internal/examples/canvas3d/quickitemtexture_wear/main.go index c0196b643..ba8e05920 100644 --- a/internal/examples/canvas3d/quickitemtexture_wear/main.go +++ b/internal/examples/canvas3d/quickitemtexture_wear/main.go @@ -5,9 +5,9 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/qml" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/qml" ) func main() { diff --git a/internal/examples/canvas3d/textureandlight/main.go b/internal/examples/canvas3d/textureandlight/main.go index 0f625e681..2572c9890 100644 --- a/internal/examples/canvas3d/textureandlight/main.go +++ b/internal/examples/canvas3d/textureandlight/main.go @@ -7,9 +7,9 @@ import ( "os" "runtime" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func main() { diff --git a/internal/examples/canvas3d/threejs/cellphone/main.go b/internal/examples/canvas3d/threejs/cellphone/main.go index 9bac9f11b..f36fcdac7 100644 --- a/internal/examples/canvas3d/threejs/cellphone/main.go +++ b/internal/examples/canvas3d/threejs/cellphone/main.go @@ -5,9 +5,9 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/qml" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/qml" ) func main() { diff --git a/internal/examples/canvas3d/threejs/oneqt/main.go b/internal/examples/canvas3d/threejs/oneqt/main.go index 5e0603429..473ef2849 100644 --- a/internal/examples/canvas3d/threejs/oneqt/main.go +++ b/internal/examples/canvas3d/threejs/oneqt/main.go @@ -7,9 +7,9 @@ import ( "os" "runtime" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func main() { diff --git a/internal/examples/canvas3d/threejs/planets/main.go b/internal/examples/canvas3d/threejs/planets/main.go index ceaa4e579..f739b3be6 100644 --- a/internal/examples/canvas3d/threejs/planets/main.go +++ b/internal/examples/canvas3d/threejs/planets/main.go @@ -7,9 +7,9 @@ import ( "os" "runtime" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func main() { diff --git a/internal/examples/charts/audio/main.go b/internal/examples/charts/audio/main.go index be8e3d2f5..6ce7bc1f1 100644 --- a/internal/examples/charts/audio/main.go +++ b/internal/examples/charts/audio/main.go @@ -5,7 +5,7 @@ package main import ( "os" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/charts/audio/widget.go b/internal/examples/charts/audio/widget.go index be006b2f4..34a70c57b 100644 --- a/internal/examples/charts/audio/widget.go +++ b/internal/examples/charts/audio/widget.go @@ -1,10 +1,10 @@ package main import ( - "github.com/therecipe/qt/charts" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/multimedia" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/charts" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/multimedia" + "github.com/StarAurryon/qt/widgets" ) type Widget struct { diff --git a/internal/examples/charts/audio/xyseriesiodevice.go b/internal/examples/charts/audio/xyseriesiodevice.go index ec19b2d03..7cc9ba8cf 100644 --- a/internal/examples/charts/audio/xyseriesiodevice.go +++ b/internal/examples/charts/audio/xyseriesiodevice.go @@ -1,8 +1,8 @@ package main import ( - "github.com/therecipe/qt/charts" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt/charts" + "github.com/StarAurryon/qt/core" ) type XYSeriesIODevice struct { diff --git a/internal/examples/charts/dynamicspline/chart.go b/internal/examples/charts/dynamicspline/chart.go index 86a1dbe2f..2d3ad7560 100644 --- a/internal/examples/charts/dynamicspline/chart.go +++ b/internal/examples/charts/dynamicspline/chart.go @@ -1,9 +1,9 @@ package main import ( - "github.com/therecipe/qt/charts" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" + "github.com/StarAurryon/qt/charts" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" ) type Chart struct { diff --git a/internal/examples/charts/dynamicspline/main.go b/internal/examples/charts/dynamicspline/main.go index 12e082d3d..8f8aa5f63 100644 --- a/internal/examples/charts/dynamicspline/main.go +++ b/internal/examples/charts/dynamicspline/main.go @@ -5,9 +5,9 @@ package main import ( "os" - "github.com/therecipe/qt/charts" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/charts" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/charts/modeldata/customtablemodel.go b/internal/examples/charts/modeldata/customtablemodel.go index 1650e221b..8e2920d35 100644 --- a/internal/examples/charts/modeldata/customtablemodel.go +++ b/internal/examples/charts/modeldata/customtablemodel.go @@ -1,8 +1,8 @@ package main import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" ) type CustomTableModel struct { diff --git a/internal/examples/charts/modeldata/main.go b/internal/examples/charts/modeldata/main.go index 95deafeb5..1f7883d96 100644 --- a/internal/examples/charts/modeldata/main.go +++ b/internal/examples/charts/modeldata/main.go @@ -5,7 +5,7 @@ package main import ( "os" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/charts/modeldata/tablewidget.go b/internal/examples/charts/modeldata/tablewidget.go index 06cff415e..6428c3035 100644 --- a/internal/examples/charts/modeldata/tablewidget.go +++ b/internal/examples/charts/modeldata/tablewidget.go @@ -4,10 +4,10 @@ import ( "strconv" "strings" - "github.com/therecipe/qt/charts" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/charts" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/widgets" ) func NewTableWidget() *widgets.QWidget { diff --git a/internal/examples/common/qml_demo/inputWidgets.go b/internal/examples/common/qml_demo/inputWidgets.go index 0aaef63f1..ee7fc208f 100644 --- a/internal/examples/common/qml_demo/inputWidgets.go +++ b/internal/examples/common/qml_demo/inputWidgets.go @@ -1,7 +1,7 @@ package main import ( - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt/core" ) func inputWidgets() { diff --git a/internal/examples/common/qml_demo/itemViews.go b/internal/examples/common/qml_demo/itemViews.go index 8435193f1..7cc38874f 100644 --- a/internal/examples/common/qml_demo/itemViews.go +++ b/internal/examples/common/qml_demo/itemViews.go @@ -1,8 +1,8 @@ package main import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" ) func itemViews() { diff --git a/internal/examples/common/qml_demo/main.go b/internal/examples/common/qml_demo/main.go index 01537f988..7dd2f3c42 100644 --- a/internal/examples/common/qml_demo/main.go +++ b/internal/examples/common/qml_demo/main.go @@ -6,9 +6,9 @@ import ( "path/filepath" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/quick" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/quick" + "github.com/StarAurryon/qt/widgets" ) var ( diff --git a/internal/examples/common/widgets_demo/buttons.go b/internal/examples/common/widgets_demo/buttons.go index ae176d501..e49879c97 100644 --- a/internal/examples/common/widgets_demo/buttons.go +++ b/internal/examples/common/widgets_demo/buttons.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/widgets" ) func buttons() { diff --git a/internal/examples/common/widgets_demo/containers.go b/internal/examples/common/widgets_demo/containers.go index 7724d94df..7c04bec1b 100644 --- a/internal/examples/common/widgets_demo/containers.go +++ b/internal/examples/common/widgets_demo/containers.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/widgets" ) func containers() { diff --git a/internal/examples/common/widgets_demo/displayWidgets.go b/internal/examples/common/widgets_demo/displayWidgets.go index e4954503c..7506d0840 100644 --- a/internal/examples/common/widgets_demo/displayWidgets.go +++ b/internal/examples/common/widgets_demo/displayWidgets.go @@ -6,10 +6,10 @@ import ( "path/filepath" "time" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" + "github.com/StarAurryon/qt/widgets" ) func displayWidgets() { diff --git a/internal/examples/common/widgets_demo/inputWidgets.go b/internal/examples/common/widgets_demo/inputWidgets.go index eb5ed5a5b..58b990b16 100644 --- a/internal/examples/common/widgets_demo/inputWidgets.go +++ b/internal/examples/common/widgets_demo/inputWidgets.go @@ -1,9 +1,9 @@ package main import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/widgets" ) func inputWidgets() { diff --git a/internal/examples/common/widgets_demo/itemViews.go b/internal/examples/common/widgets_demo/itemViews.go index 6c50978e9..7bbb5a9b0 100644 --- a/internal/examples/common/widgets_demo/itemViews.go +++ b/internal/examples/common/widgets_demo/itemViews.go @@ -1,9 +1,9 @@ package main import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/widgets" ) func itemViews() { diff --git a/internal/examples/common/widgets_demo/itemWidgets.go b/internal/examples/common/widgets_demo/itemWidgets.go index 0a29e20b3..65ddcbfa5 100644 --- a/internal/examples/common/widgets_demo/itemWidgets.go +++ b/internal/examples/common/widgets_demo/itemWidgets.go @@ -1,7 +1,7 @@ package main import ( - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/widgets" ) func itemWidgets() { diff --git a/internal/examples/common/widgets_demo/layouts.go b/internal/examples/common/widgets_demo/layouts.go index 6cf47e5b5..c3f0c3332 100644 --- a/internal/examples/common/widgets_demo/layouts.go +++ b/internal/examples/common/widgets_demo/layouts.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/widgets" ) func layouts() { diff --git a/internal/examples/common/widgets_demo/main.go b/internal/examples/common/widgets_demo/main.go index 8f74d478f..bbbedd476 100644 --- a/internal/examples/common/widgets_demo/main.go +++ b/internal/examples/common/widgets_demo/main.go @@ -3,9 +3,9 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/widgets" ) var ( @@ -38,7 +38,7 @@ func main() { mainWindow.SetCentralWidget(scrollWidget) mainWindow.ShowMaximized() - //->needed to work around some iOS issue: https://github.com/therecipe/qt/issues/451 + //->needed to work around some iOS issue: https://github.com/StarAurryon/qt/issues/451 gui.QGuiApplication_Screens()[0].SetOrientationUpdateMask(core.Qt__PrimaryOrientation | core.Qt__LandscapeOrientation | core.Qt__PortraitOrientation | core.Qt__InvertedLandscapeOrientation | core.Qt__InvertedPortraitOrientation) gui.QGuiApplication_Screens()[0].ConnectOrientationChanged(func(core.Qt__ScreenOrientation) { mainWindow.Hide() diff --git a/internal/examples/felgo/appdemos/basicapp/main.go b/internal/examples/felgo/appdemos/basicapp/main.go index 75e8d97f4..a2f748940 100644 --- a/internal/examples/felgo/appdemos/basicapp/main.go +++ b/internal/examples/felgo/appdemos/basicapp/main.go @@ -4,10 +4,10 @@ import ( "os" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/felgo" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/felgo" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/felgo/appdemos/cpp-backend-charts-qml/cppdatamodel.go b/internal/examples/felgo/appdemos/cpp-backend-charts-qml/cppdatamodel.go index f2e56f2da..db8686c29 100644 --- a/internal/examples/felgo/appdemos/cpp-backend-charts-qml/cppdatamodel.go +++ b/internal/examples/felgo/appdemos/cpp-backend-charts-qml/cppdatamodel.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt/core" ) type CppDataModel struct { diff --git a/internal/examples/felgo/appdemos/cpp-backend-charts-qml/filereader.go b/internal/examples/felgo/appdemos/cpp-backend-charts-qml/filereader.go index 7f2307a58..31d452898 100644 --- a/internal/examples/felgo/appdemos/cpp-backend-charts-qml/filereader.go +++ b/internal/examples/felgo/appdemos/cpp-backend-charts-qml/filereader.go @@ -1,7 +1,7 @@ package main import ( - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt/core" ) type FileReader struct { diff --git a/internal/examples/felgo/appdemos/cpp-backend-charts-qml/main.go b/internal/examples/felgo/appdemos/cpp-backend-charts-qml/main.go index 1d20f21d7..e4bcd49aa 100644 --- a/internal/examples/felgo/appdemos/cpp-backend-charts-qml/main.go +++ b/internal/examples/felgo/appdemos/cpp-backend-charts-qml/main.go @@ -4,10 +4,10 @@ import ( "os" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/felgo" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/felgo" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/felgo/appdemos/cpp-qml-integration/main.go b/internal/examples/felgo/appdemos/cpp-qml-integration/main.go index 9fc2bc882..4ab37a43a 100644 --- a/internal/examples/felgo/appdemos/cpp-qml-integration/main.go +++ b/internal/examples/felgo/appdemos/cpp-qml-integration/main.go @@ -4,10 +4,10 @@ import ( "os" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/felgo" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/felgo" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/felgo/appdemos/cpp-qml-integration/myglobalobject.go b/internal/examples/felgo/appdemos/cpp-qml-integration/myglobalobject.go index ccbe8f88e..16d168e32 100644 --- a/internal/examples/felgo/appdemos/cpp-qml-integration/myglobalobject.go +++ b/internal/examples/felgo/appdemos/cpp-qml-integration/myglobalobject.go @@ -1,7 +1,7 @@ package main import ( - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt/core" ) type MyGlobalObject struct { diff --git a/internal/examples/felgo/appdemos/cpp-qml-integration/myqmltype.go b/internal/examples/felgo/appdemos/cpp-qml-integration/myqmltype.go index 375410d7d..fa3c5e107 100644 --- a/internal/examples/felgo/appdemos/cpp-qml-integration/myqmltype.go +++ b/internal/examples/felgo/appdemos/cpp-qml-integration/myqmltype.go @@ -1,7 +1,7 @@ package main import ( - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt/core" ) func init() { MyQMLType_QmlRegisterType2("com.yourcompany.xyz", 1, 0, "MyQMLType") } diff --git a/internal/examples/felgo/appdemos/maps/main.go b/internal/examples/felgo/appdemos/maps/main.go index 24134b9da..3c19d1a58 100644 --- a/internal/examples/felgo/appdemos/maps/main.go +++ b/internal/examples/felgo/appdemos/maps/main.go @@ -4,10 +4,10 @@ import ( "os" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/felgo" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/felgo" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/felgo/appdemos/messaging/main.go b/internal/examples/felgo/appdemos/messaging/main.go index 4939603fe..4b12e3321 100644 --- a/internal/examples/felgo/appdemos/messaging/main.go +++ b/internal/examples/felgo/appdemos/messaging/main.go @@ -4,10 +4,10 @@ import ( "os" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/felgo" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/felgo" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/felgo/appdemos/propertycross/main.go b/internal/examples/felgo/appdemos/propertycross/main.go index c9dd1c08d..5ff9c5190 100644 --- a/internal/examples/felgo/appdemos/propertycross/main.go +++ b/internal/examples/felgo/appdemos/propertycross/main.go @@ -4,10 +4,10 @@ import ( "os" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/felgo" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/felgo" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/felgo/appdemos/qt-rest-client/main.go b/internal/examples/felgo/appdemos/qt-rest-client/main.go index 75e8d97f4..a2f748940 100644 --- a/internal/examples/felgo/appdemos/qt-rest-client/main.go +++ b/internal/examples/felgo/appdemos/qt-rest-client/main.go @@ -4,10 +4,10 @@ import ( "os" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/felgo" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/felgo" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/felgo/appdemos/qtws/cpp/cachereply.go b/internal/examples/felgo/appdemos/qtws/cpp/cachereply.go index 48f713dbf..57d7817f4 100644 --- a/internal/examples/felgo/appdemos/qtws/cpp/cachereply.go +++ b/internal/examples/felgo/appdemos/qtws/cpp/cachereply.go @@ -3,8 +3,8 @@ package cpp import ( "unsafe" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/network" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/network" ) type CacheReply struct { diff --git a/internal/examples/felgo/appdemos/qtws/cpp/cachingnetworkaccessmanager.go b/internal/examples/felgo/appdemos/qtws/cpp/cachingnetworkaccessmanager.go index 7b928e533..db67479c4 100644 --- a/internal/examples/felgo/appdemos/qtws/cpp/cachingnetworkaccessmanager.go +++ b/internal/examples/felgo/appdemos/qtws/cpp/cachingnetworkaccessmanager.go @@ -1,8 +1,8 @@ package cpp import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/network" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/network" ) type CachingNetworkAccessManager struct { diff --git a/internal/examples/felgo/appdemos/qtws/cpp/diskcachefactory.go b/internal/examples/felgo/appdemos/qtws/cpp/diskcachefactory.go index 5efe40c1d..82a763cd8 100644 --- a/internal/examples/felgo/appdemos/qtws/cpp/diskcachefactory.go +++ b/internal/examples/felgo/appdemos/qtws/cpp/diskcachefactory.go @@ -1,9 +1,9 @@ package cpp import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/network" - "github.com/therecipe/qt/qml" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/network" + "github.com/StarAurryon/qt/qml" ) type DiskCacheFactory struct { diff --git a/internal/examples/felgo/appdemos/qtws/main.go b/internal/examples/felgo/appdemos/qtws/main.go index 5a584b8c5..475cc77fc 100644 --- a/internal/examples/felgo/appdemos/qtws/main.go +++ b/internal/examples/felgo/appdemos/qtws/main.go @@ -4,14 +4,14 @@ import ( "os" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/felgo" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/felgo" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/widgets" - "github.com/therecipe/qt/internal/examples/3rdparty/qzxing" + "github.com/StarAurryon/qt/internal/examples/3rdparty/qzxing" - "github.com/therecipe/qt/internal/examples/felgo/appdemos/qtws/cpp" + "github.com/StarAurryon/qt/internal/examples/felgo/appdemos/qtws/cpp" ) func main() { diff --git a/internal/examples/felgo/appdemos/showcase/main.go b/internal/examples/felgo/appdemos/showcase/main.go index ceeef5edd..a40e0cdfd 100644 --- a/internal/examples/felgo/appdemos/showcase/main.go +++ b/internal/examples/felgo/appdemos/showcase/main.go @@ -4,12 +4,12 @@ import ( "os" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/felgo" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/quickcontrols2" - "github.com/therecipe/qt/webview" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/felgo" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/quickcontrols2" + "github.com/StarAurryon/qt/webview" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/felgo/appdemos/twitter/main.go b/internal/examples/felgo/appdemos/twitter/main.go index 883c23f08..76dd48a3a 100644 --- a/internal/examples/felgo/appdemos/twitter/main.go +++ b/internal/examples/felgo/appdemos/twitter/main.go @@ -4,10 +4,10 @@ import ( "os" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/felgo" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/felgo" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/felgo/appdemos/weather/main.go b/internal/examples/felgo/appdemos/weather/main.go index 2a4d417fb..eafd08843 100644 --- a/internal/examples/felgo/appdemos/weather/main.go +++ b/internal/examples/felgo/appdemos/weather/main.go @@ -4,10 +4,10 @@ import ( "os" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/felgo" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/felgo" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/felgo/appdemos/youtube-player/main.go b/internal/examples/felgo/appdemos/youtube-player/main.go index 37fa9c473..33b09f2e7 100644 --- a/internal/examples/felgo/appdemos/youtube-player/main.go +++ b/internal/examples/felgo/appdemos/youtube-player/main.go @@ -4,10 +4,10 @@ import ( "os" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/felgo" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/felgo" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/felgo/demos/2048/main.go b/internal/examples/felgo/demos/2048/main.go index 75e8d97f4..a2f748940 100644 --- a/internal/examples/felgo/demos/2048/main.go +++ b/internal/examples/felgo/demos/2048/main.go @@ -4,10 +4,10 @@ import ( "os" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/felgo" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/felgo" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/felgo/demos/BalloonPop/main.go b/internal/examples/felgo/demos/BalloonPop/main.go index cd3b0daff..752ce046c 100644 --- a/internal/examples/felgo/demos/BalloonPop/main.go +++ b/internal/examples/felgo/demos/BalloonPop/main.go @@ -4,10 +4,10 @@ import ( "os" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/felgo" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/felgo" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/felgo/demos/CarChallenge/main.go b/internal/examples/felgo/demos/CarChallenge/main.go index b956dfeb8..11c3a4b15 100644 --- a/internal/examples/felgo/demos/CarChallenge/main.go +++ b/internal/examples/felgo/demos/CarChallenge/main.go @@ -4,10 +4,10 @@ import ( "os" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/felgo" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/felgo" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/felgo/demos/ChickenOutbreak/main.go b/internal/examples/felgo/demos/ChickenOutbreak/main.go index cbb2495ce..70c9fb687 100644 --- a/internal/examples/felgo/demos/ChickenOutbreak/main.go +++ b/internal/examples/felgo/demos/ChickenOutbreak/main.go @@ -4,10 +4,10 @@ import ( "os" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/felgo" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/felgo" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/felgo/demos/CrazyCarousel/main.go b/internal/examples/felgo/demos/CrazyCarousel/main.go index 75e8d97f4..a2f748940 100644 --- a/internal/examples/felgo/demos/CrazyCarousel/main.go +++ b/internal/examples/felgo/demos/CrazyCarousel/main.go @@ -4,10 +4,10 @@ import ( "os" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/felgo" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/felgo" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/felgo/demos/DoodleJump/main.go b/internal/examples/felgo/demos/DoodleJump/main.go index 75e8d97f4..a2f748940 100644 --- a/internal/examples/felgo/demos/DoodleJump/main.go +++ b/internal/examples/felgo/demos/DoodleJump/main.go @@ -4,10 +4,10 @@ import ( "os" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/felgo" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/felgo" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/felgo/playground/AppPlayground/main.go b/internal/examples/felgo/playground/AppPlayground/main.go index 75e8d97f4..a2f748940 100644 --- a/internal/examples/felgo/playground/AppPlayground/main.go +++ b/internal/examples/felgo/playground/AppPlayground/main.go @@ -4,10 +4,10 @@ import ( "os" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/felgo" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/felgo" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/felgo/playground/GamePlayground/main.go b/internal/examples/felgo/playground/GamePlayground/main.go index 75e8d97f4..a2f748940 100644 --- a/internal/examples/felgo/playground/GamePlayground/main.go +++ b/internal/examples/felgo/playground/GamePlayground/main.go @@ -4,10 +4,10 @@ import ( "os" "strings" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/felgo" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/felgo" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/go.mod b/internal/examples/go.mod index aa0fa8078..c41c35fe8 100644 --- a/internal/examples/go.mod +++ b/internal/examples/go.mod @@ -1 +1 @@ -module github.com/therecipe/qt/internal/examples +module github.com/StarAurryon/qt/internal/examples diff --git a/internal/examples/grpc/hello_world/hello_world.go b/internal/examples/grpc/hello_world/hello_world.go index ee930e34e..9833a1bec 100644 --- a/internal/examples/grpc/hello_world/hello_world.go +++ b/internal/examples/grpc/hello_world/hello_world.go @@ -3,9 +3,9 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) type HelloClientRPC struct { diff --git a/internal/examples/grpc/hello_world2/hello_world2.go b/internal/examples/grpc/hello_world2/hello_world2.go index 5d9777401..cebf38c3c 100644 --- a/internal/examples/grpc/hello_world2/hello_world2.go +++ b/internal/examples/grpc/hello_world2/hello_world2.go @@ -3,9 +3,9 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) type HelloClientRPC struct { diff --git a/internal/examples/gui/advancedclock/main.go b/internal/examples/gui/advancedclock/main.go index 547e6dd79..9ce9d7fc4 100644 --- a/internal/examples/gui/advancedclock/main.go +++ b/internal/examples/gui/advancedclock/main.go @@ -6,9 +6,9 @@ import ( "fmt" "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/widgets" ) type AnalogClockQwdgt struct { diff --git a/internal/examples/gui/analogclock/analogclock.go b/internal/examples/gui/analogclock/analogclock.go index e89fee3a9..44117b444 100644 --- a/internal/examples/gui/analogclock/analogclock.go +++ b/internal/examples/gui/analogclock/analogclock.go @@ -5,8 +5,8 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" ) type AnalogClockWindow struct { diff --git a/internal/examples/gui/analogclock/rasterwindow.go b/internal/examples/gui/analogclock/rasterwindow.go index f0d6286a6..6443ccf18 100644 --- a/internal/examples/gui/analogclock/rasterwindow.go +++ b/internal/examples/gui/analogclock/rasterwindow.go @@ -1,8 +1,8 @@ package main import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" ) type RasterWindow struct { diff --git a/internal/examples/gui/openglwindow/js.go b/internal/examples/gui/openglwindow/js.go index b5964e0ac..c2c641349 100644 --- a/internal/examples/gui/openglwindow/js.go +++ b/internal/examples/gui/openglwindow/js.go @@ -5,7 +5,7 @@ package main import ( "unsafe" - "github.com/therecipe/qt" + "github.com/StarAurryon/qt" ) var ( diff --git a/internal/examples/gui/openglwindow/main.go b/internal/examples/gui/openglwindow/main.go index e93b80add..366dfc9d6 100644 --- a/internal/examples/gui/openglwindow/main.go +++ b/internal/examples/gui/openglwindow/main.go @@ -5,7 +5,7 @@ package main import ( "os" - "github.com/therecipe/qt/gui" + "github.com/StarAurryon/qt/gui" ) const ( diff --git a/internal/examples/gui/openglwindow/openglwindow.go b/internal/examples/gui/openglwindow/openglwindow.go index 3933f3fbe..9b70f2c5b 100644 --- a/internal/examples/gui/openglwindow/openglwindow.go +++ b/internal/examples/gui/openglwindow/openglwindow.go @@ -1,8 +1,8 @@ package main import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" ) const ( diff --git a/internal/examples/gui/rasterwindow/main.go b/internal/examples/gui/rasterwindow/main.go index ab6f9fe53..b6d1cb6f0 100644 --- a/internal/examples/gui/rasterwindow/main.go +++ b/internal/examples/gui/rasterwindow/main.go @@ -5,7 +5,7 @@ package main import ( "os" - "github.com/therecipe/qt/gui" + "github.com/StarAurryon/qt/gui" ) func main() { diff --git a/internal/examples/gui/rasterwindow/rasterwindow.go b/internal/examples/gui/rasterwindow/rasterwindow.go index 4f8cfc680..a3b7f2852 100644 --- a/internal/examples/gui/rasterwindow/rasterwindow.go +++ b/internal/examples/gui/rasterwindow/rasterwindow.go @@ -1,8 +1,8 @@ package main import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" ) type RasterWindow struct { diff --git a/internal/examples/opengl/2dpainting/glwidget.go b/internal/examples/opengl/2dpainting/glwidget.go index 28e49b23d..189051f80 100644 --- a/internal/examples/opengl/2dpainting/glwidget.go +++ b/internal/examples/opengl/2dpainting/glwidget.go @@ -1,8 +1,8 @@ package main import ( - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/widgets" ) type GLWidget struct { diff --git a/internal/examples/opengl/2dpainting/helper.go b/internal/examples/opengl/2dpainting/helper.go index c16fcf08d..26f3f403a 100644 --- a/internal/examples/opengl/2dpainting/helper.go +++ b/internal/examples/opengl/2dpainting/helper.go @@ -1,8 +1,8 @@ package main import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" ) type Helper struct { diff --git a/internal/examples/opengl/2dpainting/main.go b/internal/examples/opengl/2dpainting/main.go index 35bf20296..92e59632c 100644 --- a/internal/examples/opengl/2dpainting/main.go +++ b/internal/examples/opengl/2dpainting/main.go @@ -5,8 +5,8 @@ package main import ( "os" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/opengl/2dpainting/widget.go b/internal/examples/opengl/2dpainting/widget.go index 72d18fb95..8267c4305 100644 --- a/internal/examples/opengl/2dpainting/widget.go +++ b/internal/examples/opengl/2dpainting/widget.go @@ -1,8 +1,8 @@ package main import ( - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/widgets" ) type Widget struct { diff --git a/internal/examples/opengl/2dpainting/window.go b/internal/examples/opengl/2dpainting/window.go index 1059e9726..fe629e88e 100644 --- a/internal/examples/opengl/2dpainting/window.go +++ b/internal/examples/opengl/2dpainting/window.go @@ -1,8 +1,8 @@ package main import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/widgets" ) type Window struct { diff --git a/internal/examples/plugins/go/main.go b/internal/examples/plugins/go/main.go index 5ecaa21ca..5e9f3a0b9 100644 --- a/internal/examples/plugins/go/main.go +++ b/internal/examples/plugins/go/main.go @@ -5,10 +5,10 @@ import ( "os" "plugin" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/quick" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/quick" + "github.com/StarAurryon/qt/widgets" ) //go:generate cp main.go ./plugin diff --git a/internal/examples/plugins/go/plugin/plugin.go b/internal/examples/plugins/go/plugin/plugin.go index 095ac3bb8..fd1f79f9f 100644 --- a/internal/examples/plugins/go/plugin/plugin.go +++ b/internal/examples/plugins/go/plugin/plugin.go @@ -1,9 +1,9 @@ package main import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func init() { diff --git a/internal/examples/plugins/mixed/main.go b/internal/examples/plugins/mixed/main.go index 155477627..d07ca4e79 100644 --- a/internal/examples/plugins/mixed/main.go +++ b/internal/examples/plugins/mixed/main.go @@ -5,10 +5,10 @@ import ( "os" "plugin" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/quick" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/quick" + "github.com/StarAurryon/qt/widgets" ) //go:generate cp main.go ./plugin diff --git a/internal/examples/plugins/mixed/plugin/plugin.go b/internal/examples/plugins/mixed/plugin/plugin.go index a71e2541b..69752bf12 100644 --- a/internal/examples/plugins/mixed/plugin/plugin.go +++ b/internal/examples/plugins/mixed/plugin/plugin.go @@ -1,9 +1,9 @@ package main import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func init() { diff --git a/internal/examples/plugins/qml/main.go b/internal/examples/plugins/qml/main.go index b236a6718..d041e8a82 100644 --- a/internal/examples/plugins/qml/main.go +++ b/internal/examples/plugins/qml/main.go @@ -5,10 +5,10 @@ import ( "os" "plugin" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/quick" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/quick" + "github.com/StarAurryon/qt/widgets" ) //go:generate qtrcc desktop ./plugin diff --git a/internal/examples/qml/adding/main.go b/internal/examples/qml/adding/main.go index ddb8c4de2..8c7f1cd07 100644 --- a/internal/examples/qml/adding/main.go +++ b/internal/examples/qml/adding/main.go @@ -5,8 +5,8 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/qml" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/qml" ) func main() { diff --git a/internal/examples/qml/adding/person.go b/internal/examples/qml/adding/person.go index 6b729badc..27eb212cb 100644 --- a/internal/examples/qml/adding/person.go +++ b/internal/examples/qml/adding/person.go @@ -1,7 +1,7 @@ package main import ( - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt/core" ) type Person struct { diff --git a/internal/examples/qml/application/application.go b/internal/examples/qml/application/application.go index e4e12d542..1577d8856 100644 --- a/internal/examples/qml/application/application.go +++ b/internal/examples/qml/application/application.go @@ -3,9 +3,9 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/qml" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/qml" ) func main() { diff --git a/internal/examples/qml/custom_scheme/main.go b/internal/examples/qml/custom_scheme/main.go index 78ad0d623..b21af771d 100644 --- a/internal/examples/qml/custom_scheme/main.go +++ b/internal/examples/qml/custom_scheme/main.go @@ -3,11 +3,11 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/network" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/quick" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/network" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/quick" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/qml/custom_scheme/reply.go b/internal/examples/qml/custom_scheme/reply.go index 6316448f8..7bea78135 100644 --- a/internal/examples/qml/custom_scheme/reply.go +++ b/internal/examples/qml/custom_scheme/reply.go @@ -1,8 +1,8 @@ package main import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/network" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/network" ) //the custom QNetworkReply is partially modeled after diff --git a/internal/examples/qml/drawer_nav_x/applicationui.go b/internal/examples/qml/drawer_nav_x/applicationui.go index db6401c2e..19cabdf9a 100644 --- a/internal/examples/qml/drawer_nav_x/applicationui.go +++ b/internal/examples/qml/drawer_nav_x/applicationui.go @@ -1,6 +1,6 @@ package main -import "github.com/therecipe/qt/core" +import "github.com/StarAurryon/qt/core" var ( materialRed = []string{"#FFCDD2", "#F44336", "#D32F2F", "#000000", "#FFFFFF", "#FFFFFF", "black", "white", "white"} diff --git a/internal/examples/qml/drawer_nav_x/main.go b/internal/examples/qml/drawer_nav_x/main.go index 245382914..5d2541c18 100644 --- a/internal/examples/qml/drawer_nav_x/main.go +++ b/internal/examples/qml/drawer_nav_x/main.go @@ -5,10 +5,10 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/quickcontrols2" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/quickcontrols2" ) func main() { diff --git a/internal/examples/qml/extending/chapter1-basics/main.go b/internal/examples/qml/extending/chapter1-basics/main.go index b46534c68..44d8ed6ab 100644 --- a/internal/examples/qml/extending/chapter1-basics/main.go +++ b/internal/examples/qml/extending/chapter1-basics/main.go @@ -5,9 +5,9 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func main() { diff --git a/internal/examples/qml/extending/chapter1-basics/piechart.go b/internal/examples/qml/extending/chapter1-basics/piechart.go index e3d47d55b..f0d54741a 100644 --- a/internal/examples/qml/extending/chapter1-basics/piechart.go +++ b/internal/examples/qml/extending/chapter1-basics/piechart.go @@ -1,9 +1,9 @@ package main import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func init() { diff --git a/internal/examples/qml/extending/chapter2-methods/main.go b/internal/examples/qml/extending/chapter2-methods/main.go index b46534c68..44d8ed6ab 100644 --- a/internal/examples/qml/extending/chapter2-methods/main.go +++ b/internal/examples/qml/extending/chapter2-methods/main.go @@ -5,9 +5,9 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func main() { diff --git a/internal/examples/qml/extending/chapter2-methods/piechart.go b/internal/examples/qml/extending/chapter2-methods/piechart.go index a22d55fa3..41d03c555 100644 --- a/internal/examples/qml/extending/chapter2-methods/piechart.go +++ b/internal/examples/qml/extending/chapter2-methods/piechart.go @@ -1,9 +1,9 @@ package main import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func init() { diff --git a/internal/examples/qml/extending/chapter3-bindings/main.go b/internal/examples/qml/extending/chapter3-bindings/main.go index b46534c68..44d8ed6ab 100644 --- a/internal/examples/qml/extending/chapter3-bindings/main.go +++ b/internal/examples/qml/extending/chapter3-bindings/main.go @@ -5,9 +5,9 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func main() { diff --git a/internal/examples/qml/extending/chapter3-bindings/piechart.go b/internal/examples/qml/extending/chapter3-bindings/piechart.go index 95a189539..a8421193f 100644 --- a/internal/examples/qml/extending/chapter3-bindings/piechart.go +++ b/internal/examples/qml/extending/chapter3-bindings/piechart.go @@ -1,9 +1,9 @@ package main import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func init() { diff --git a/internal/examples/qml/extending/chapter4-customPropertyTypes/main.go b/internal/examples/qml/extending/chapter4-customPropertyTypes/main.go index b46534c68..44d8ed6ab 100644 --- a/internal/examples/qml/extending/chapter4-customPropertyTypes/main.go +++ b/internal/examples/qml/extending/chapter4-customPropertyTypes/main.go @@ -5,9 +5,9 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func main() { diff --git a/internal/examples/qml/extending/chapter4-customPropertyTypes/piechart.go b/internal/examples/qml/extending/chapter4-customPropertyTypes/piechart.go index 8527e3f26..ed081a085 100644 --- a/internal/examples/qml/extending/chapter4-customPropertyTypes/piechart.go +++ b/internal/examples/qml/extending/chapter4-customPropertyTypes/piechart.go @@ -1,7 +1,7 @@ package main import ( - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/quick" ) func init() { diff --git a/internal/examples/qml/extending/chapter4-customPropertyTypes/pieslice.go b/internal/examples/qml/extending/chapter4-customPropertyTypes/pieslice.go index c3b3133e7..1d058978c 100644 --- a/internal/examples/qml/extending/chapter4-customPropertyTypes/pieslice.go +++ b/internal/examples/qml/extending/chapter4-customPropertyTypes/pieslice.go @@ -1,9 +1,9 @@ package main import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func init() { diff --git a/internal/examples/qml/extending/components/test_dir/component/piechart.go b/internal/examples/qml/extending/components/test_dir/component/piechart.go index eb95908e4..8b8486892 100644 --- a/internal/examples/qml/extending/components/test_dir/component/piechart.go +++ b/internal/examples/qml/extending/components/test_dir/component/piechart.go @@ -1,9 +1,9 @@ package component import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func init() { diff --git a/internal/examples/qml/extending/components/test_dir/main.go b/internal/examples/qml/extending/components/test_dir/main.go index b66de952a..a42bcef4b 100644 --- a/internal/examples/qml/extending/components/test_dir/main.go +++ b/internal/examples/qml/extending/components/test_dir/main.go @@ -3,11 +3,11 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" - _ "github.com/therecipe/qt/internal/examples/qml/extending/components/test_dir/component" + _ "github.com/StarAurryon/qt/internal/examples/qml/extending/components/test_dir/component" ) func main() { diff --git a/internal/examples/qml/extending/components/test_dir_2/component/piechart.go b/internal/examples/qml/extending/components/test_dir_2/component/piechart.go index eb95908e4..8b8486892 100644 --- a/internal/examples/qml/extending/components/test_dir_2/component/piechart.go +++ b/internal/examples/qml/extending/components/test_dir_2/component/piechart.go @@ -1,9 +1,9 @@ package component import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func init() { diff --git a/internal/examples/qml/extending/components/test_dir_2/main.go b/internal/examples/qml/extending/components/test_dir_2/main.go index d2c7eb1e2..ffabf1f77 100644 --- a/internal/examples/qml/extending/components/test_dir_2/main.go +++ b/internal/examples/qml/extending/components/test_dir_2/main.go @@ -3,11 +3,11 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" - _ "github.com/therecipe/qt/internal/examples/qml/extending/components/test_dir_2/component" + _ "github.com/StarAurryon/qt/internal/examples/qml/extending/components/test_dir_2/component" ) func main() { diff --git a/internal/examples/qml/extending/components/test_go/component/piechart.go b/internal/examples/qml/extending/components/test_go/component/piechart.go index eb95908e4..8b8486892 100644 --- a/internal/examples/qml/extending/components/test_go/component/piechart.go +++ b/internal/examples/qml/extending/components/test_go/component/piechart.go @@ -1,9 +1,9 @@ package component import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func init() { diff --git a/internal/examples/qml/extending/components/test_go/main.go b/internal/examples/qml/extending/components/test_go/main.go index b4b3891ca..0ba5f3086 100644 --- a/internal/examples/qml/extending/components/test_go/main.go +++ b/internal/examples/qml/extending/components/test_go/main.go @@ -3,11 +3,11 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" - _ "github.com/therecipe/qt/internal/examples/qml/extending/components/test_go/component" + _ "github.com/StarAurryon/qt/internal/examples/qml/extending/components/test_go/component" ) func main() { diff --git a/internal/examples/qml/extending/components/test_module/component/piechart.go b/internal/examples/qml/extending/components/test_module/component/piechart.go index eb95908e4..8b8486892 100644 --- a/internal/examples/qml/extending/components/test_module/component/piechart.go +++ b/internal/examples/qml/extending/components/test_module/component/piechart.go @@ -1,9 +1,9 @@ package component import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func init() { diff --git a/internal/examples/qml/extending/components/test_module/main.go b/internal/examples/qml/extending/components/test_module/main.go index a7015d0d3..c38c7de16 100644 --- a/internal/examples/qml/extending/components/test_module/main.go +++ b/internal/examples/qml/extending/components/test_module/main.go @@ -3,11 +3,11 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" - _ "github.com/therecipe/qt/internal/examples/qml/extending/components/test_module/component" + _ "github.com/StarAurryon/qt/internal/examples/qml/extending/components/test_module/component" ) func main() { diff --git a/internal/examples/qml/extending/components/test_module_2/component/piechart.go b/internal/examples/qml/extending/components/test_module_2/component/piechart.go index eb95908e4..8b8486892 100644 --- a/internal/examples/qml/extending/components/test_module_2/component/piechart.go +++ b/internal/examples/qml/extending/components/test_module_2/component/piechart.go @@ -1,9 +1,9 @@ package component import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func init() { diff --git a/internal/examples/qml/extending/components/test_module_2/main.go b/internal/examples/qml/extending/components/test_module_2/main.go index 50b93e584..a105c4131 100644 --- a/internal/examples/qml/extending/components/test_module_2/main.go +++ b/internal/examples/qml/extending/components/test_module_2/main.go @@ -3,11 +3,11 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" - _ "github.com/therecipe/qt/internal/examples/qml/extending/components/test_module_2/component" + _ "github.com/StarAurryon/qt/internal/examples/qml/extending/components/test_module_2/component" ) func main() { diff --git a/internal/examples/qml/extending/components/test_qml/main.go b/internal/examples/qml/extending/components/test_qml/main.go index 455bd680b..ac6d2c893 100644 --- a/internal/examples/qml/extending/components/test_qml/main.go +++ b/internal/examples/qml/extending/components/test_qml/main.go @@ -3,11 +3,11 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" - _ "github.com/therecipe/qt/internal/examples/qml/extending/components/test_qml/component" + _ "github.com/StarAurryon/qt/internal/examples/qml/extending/components/test_qml/component" ) func main() { diff --git a/internal/examples/qml/extending/components/test_qml_go/component/piechart.go b/internal/examples/qml/extending/components/test_qml_go/component/piechart.go index eb95908e4..8b8486892 100644 --- a/internal/examples/qml/extending/components/test_qml_go/component/piechart.go +++ b/internal/examples/qml/extending/components/test_qml_go/component/piechart.go @@ -1,9 +1,9 @@ package component import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func init() { diff --git a/internal/examples/qml/extending/components/test_qml_go/main.go b/internal/examples/qml/extending/components/test_qml_go/main.go index 17cda7350..9ea54da09 100644 --- a/internal/examples/qml/extending/components/test_qml_go/main.go +++ b/internal/examples/qml/extending/components/test_qml_go/main.go @@ -3,11 +3,11 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" - _ "github.com/therecipe/qt/internal/examples/qml/extending/components/test_qml_go/component" + _ "github.com/StarAurryon/qt/internal/examples/qml/extending/components/test_qml_go/component" ) func main() { diff --git a/internal/examples/qml/gallery/gallery.go b/internal/examples/qml/gallery/gallery.go index ed2c2c0a2..7b80205ec 100644 --- a/internal/examples/qml/gallery/gallery.go +++ b/internal/examples/qml/gallery/gallery.go @@ -3,10 +3,10 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/quickcontrols2" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/quickcontrols2" ) func main() { diff --git a/internal/examples/qml/gocv/gocv.go b/internal/examples/qml/gocv/gocv.go index 813c60974..831340d91 100644 --- a/internal/examples/qml/gocv/gocv.go +++ b/internal/examples/qml/gocv/gocv.go @@ -1,9 +1,9 @@ package main import ( - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" "fmt" "gocv.io/x/gocv" diff --git a/internal/examples/qml/gocv/main.go b/internal/examples/qml/gocv/main.go index 4f2c2a279..fcb960514 100644 --- a/internal/examples/qml/gocv/main.go +++ b/internal/examples/qml/gocv/main.go @@ -3,9 +3,9 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func main() { diff --git a/internal/examples/qml/material/material.go b/internal/examples/qml/material/material.go index 90e825a0e..51cc1fc2a 100644 --- a/internal/examples/qml/material/material.go +++ b/internal/examples/qml/material/material.go @@ -3,9 +3,9 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/qml" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/qml" ) func main() { diff --git a/internal/examples/qml/prop/prop.go b/internal/examples/qml/prop/prop.go index 527204e4c..fcb2b34d7 100644 --- a/internal/examples/qml/prop/prop.go +++ b/internal/examples/qml/prop/prop.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/qml" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/qml" ) func main() { diff --git a/internal/examples/qml/prop2/prop2.go b/internal/examples/qml/prop2/prop2.go index 9bf34a7c0..88bc1506c 100644 --- a/internal/examples/qml/prop2/prop2.go +++ b/internal/examples/qml/prop2/prop2.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/qml" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/qml" ) type QmlBride struct { diff --git a/internal/examples/qml/webview/webview.go b/internal/examples/qml/webview/webview.go index 5d890b10d..af8d456c0 100644 --- a/internal/examples/qml/webview/webview.go +++ b/internal/examples/qml/webview/webview.go @@ -5,10 +5,10 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/webview" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/webview" ) func main() { diff --git a/internal/examples/qt3d/audio-visualizer-qml/main.go b/internal/examples/qt3d/audio-visualizer-qml/main.go index 684e91d3a..4e7ee31ae 100644 --- a/internal/examples/qt3d/audio-visualizer-qml/main.go +++ b/internal/examples/qt3d/audio-visualizer-qml/main.go @@ -5,9 +5,9 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func main() { diff --git a/internal/examples/qt3d/audio-visualizer-qml/touchsettings.go b/internal/examples/qt3d/audio-visualizer-qml/touchsettings.go index 196380f82..3b7af91ea 100644 --- a/internal/examples/qt3d/audio-visualizer-qml/touchsettings.go +++ b/internal/examples/qt3d/audio-visualizer-qml/touchsettings.go @@ -4,8 +4,8 @@ import ( "os" "runtime" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" ) type TouchSettings struct { diff --git a/internal/examples/quick/bridge/bridge.go b/internal/examples/quick/bridge/bridge.go index f83b2e09c..d461c3b2a 100644 --- a/internal/examples/quick/bridge/bridge.go +++ b/internal/examples/quick/bridge/bridge.go @@ -8,9 +8,9 @@ import ( "os" "time" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/quick" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/quick" + "github.com/StarAurryon/qt/widgets" ) var ( diff --git a/internal/examples/quick/bridge2/bridge2.go b/internal/examples/quick/bridge2/bridge2.go index 09b899cb1..9097e3490 100644 --- a/internal/examples/quick/bridge2/bridge2.go +++ b/internal/examples/quick/bridge2/bridge2.go @@ -7,9 +7,9 @@ import ( "os" "time" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) type QmlBridge struct { diff --git a/internal/examples/quick/calc/calc.go b/internal/examples/quick/calc/calc.go index 3398f4e78..7f5372749 100644 --- a/internal/examples/quick/calc/calc.go +++ b/internal/examples/quick/calc/calc.go @@ -3,9 +3,9 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func main() { diff --git a/internal/examples/quick/cookies/cookies.go b/internal/examples/quick/cookies/cookies.go index f1c775a87..ed7d66872 100644 --- a/internal/examples/quick/cookies/cookies.go +++ b/internal/examples/quick/cookies/cookies.go @@ -3,11 +3,11 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/network" - "github.com/therecipe/qt/quick" - "github.com/therecipe/qt/webengine" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/network" + "github.com/StarAurryon/qt/quick" + "github.com/StarAurryon/qt/webengine" ) type bridge struct { diff --git a/internal/examples/quick/dialog/dialog.go b/internal/examples/quick/dialog/dialog.go index dd3cfbd56..7c556adcd 100644 --- a/internal/examples/quick/dialog/dialog.go +++ b/internal/examples/quick/dialog/dialog.go @@ -3,9 +3,9 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func main() { diff --git a/internal/examples/quick/dynamic/dynamic.go b/internal/examples/quick/dynamic/dynamic.go index 277bb2186..7b34ebc5b 100644 --- a/internal/examples/quick/dynamic/dynamic.go +++ b/internal/examples/quick/dynamic/dynamic.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/quick" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/quick" + "github.com/StarAurryon/qt/widgets" ) func main() { diff --git a/internal/examples/quick/errors/main.go b/internal/examples/quick/errors/main.go index 29d879392..efbdb3e63 100644 --- a/internal/examples/quick/errors/main.go +++ b/internal/examples/quick/errors/main.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/quick" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/quick" + "github.com/StarAurryon/qt/widgets" ) //this example demonstrates one possible way to deal with qml errors/warnings diff --git a/internal/examples/quick/hotreload/hotreload.go b/internal/examples/quick/hotreload/hotreload.go index 7500790d2..a58a080f8 100644 --- a/internal/examples/quick/hotreload/hotreload.go +++ b/internal/examples/quick/hotreload/hotreload.go @@ -4,9 +4,9 @@ import ( "os" "path/filepath" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/quick" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/quick" + "github.com/StarAurryon/qt/widgets" ) func initQQuickView(path string) *quick.QQuickView { diff --git a/internal/examples/quick/listview/main.go b/internal/examples/quick/listview/main.go index 07a030823..850da7ee8 100644 --- a/internal/examples/quick/listview/main.go +++ b/internal/examples/quick/listview/main.go @@ -4,9 +4,9 @@ import ( "os" "time" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" ) func main() { diff --git a/internal/examples/quick/listview/personmodel.go b/internal/examples/quick/listview/personmodel.go index 1bcf84ce8..65c49f5f5 100644 --- a/internal/examples/quick/listview/personmodel.go +++ b/internal/examples/quick/listview/personmodel.go @@ -1,6 +1,6 @@ package main -import "github.com/therecipe/qt/core" +import "github.com/StarAurryon/qt/core" const ( FirstName = int(core.Qt__UserRole) + 1< diff --git a/internal/examples/widgets/xkcd/main.go b/internal/examples/widgets/xkcd/main.go index 14b01a769..5c94c4651 100644 --- a/internal/examples/widgets/xkcd/main.go +++ b/internal/examples/widgets/xkcd/main.go @@ -11,9 +11,9 @@ import ( "strconv" "time" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/widgets" ) var data_struct struct { diff --git a/internal/utils/env.go b/internal/utils/env.go index de11c55e3..864eac133 100644 --- a/internal/utils/env.go +++ b/internal/utils/env.go @@ -423,7 +423,7 @@ func QT_GEN_QUICK_EXTRAS() bool { func GoList(args ...string) *exec.Cmd { cmd := exec.Command("go", "list") if UseGOMOD("") { - if !(strings.Contains(strings.Join(args, "|"), "github.com/therecipe/qt/internal") && !strings.Contains(strings.Join(args, "|"), "github.com/therecipe/qt/internal/binding/runtime")) { + if !(strings.Contains(strings.Join(args, "|"), "github.com/StarAurryon/qt/internal") && !strings.Contains(strings.Join(args, "|"), "github.com/StarAurryon/qt/internal/binding/runtime")) { cmd.Args = append(cmd.Args, GOFLAGS()) } else if GOVERSION_NUM() >= 114 { cmd.Args = append(cmd.Args, "-mod=mod") diff --git a/internal/utils/gopath.go b/internal/utils/gopath.go index 5a445df08..2f38be1f3 100644 --- a/internal/utils/gopath.go +++ b/internal/utils/gopath.go @@ -9,7 +9,7 @@ import ( "sync" ) -const PackageName = "github.com/therecipe/qt" +const PackageName = "github.com/StarAurryon/qt" var ( mustGoPath string diff --git a/internal/vagrant/freebsd/freebsd.sh b/internal/vagrant/freebsd/freebsd.sh index ca378525f..5e08ce0fa 100755 --- a/internal/vagrant/freebsd/freebsd.sh +++ b/internal/vagrant/freebsd/freebsd.sh @@ -8,7 +8,7 @@ sudo sysrc dbus_enable=YES && sudo sysrc hald_enable=YES && sudo sysrc slim_enab sudo service dbus start && sudo service hald start && sudo service slim start sudo pkg ins -y git go pkgconf qt5 -go get -v github.com/therecipe/qt/cmd/... +go get -v github.com/StarAurryon/qt/cmd/... QT_PKG_CONFIG=true $(go env GOPATH)/bin/qtsetup test exit 0 \ No newline at end of file diff --git a/internal/vagrant/pre.bat b/internal/vagrant/pre.bat index c5b7e5c32..be097c508 100644 --- a/internal/vagrant/pre.bat +++ b/internal/vagrant/pre.bat @@ -44,7 +44,7 @@ set GOPATH=C:\gopath setx /M GOROOT "C:\go" set GOROOT=C:\go -go get -v -tags=no_env github.com/therecipe/qt/cmd/... +go get -v -tags=no_env github.com/StarAurryon/qt/cmd/... ::install VC++ 2015 Redis diff --git a/internal/vagrant/pre.sh b/internal/vagrant/pre.sh index a954cb3a6..3e28ba07a 100755 --- a/internal/vagrant/pre.sh +++ b/internal/vagrant/pre.sh @@ -49,7 +49,7 @@ if [[ "$OS" == "darwin" ]]; then ln -s $HOME/gopath $HOME/Desktop/GOPATH fi -go get -v -tags=no_env github.com/therecipe/qt/cmd/... +go get -v -tags=no_env github.com/StarAurryon/qt/cmd/... if [[ "$OS" == "darwin" ]]; then sudo xcode-select -s /Applications/Xcode.app/Contents/Developer diff --git a/interop/dart/dart.go b/interop/dart/dart.go index a4fbdf46c..1db0f0bad 100644 --- a/interop/dart/dart.go +++ b/interop/dart/dart.go @@ -17,7 +17,7 @@ import "C" import ( "unsafe" - "github.com/therecipe/qt/interop" + "github.com/StarAurryon/qt/interop" ) var ( diff --git a/interop/haxe/haxe.go b/interop/haxe/haxe.go index a89a56dce..014c43417 100644 --- a/interop/haxe/haxe.go +++ b/interop/haxe/haxe.go @@ -1,6 +1,6 @@ package haxe -import "github.com/therecipe/qt/interop" +import "github.com/StarAurryon/qt/interop" func init() { interop.ReturnPointersAsStrings = true diff --git a/interop/interop.go b/interop/interop.go index 5ff5a36a5..8a12c8cb9 100644 --- a/interop/interop.go +++ b/interop/interop.go @@ -10,8 +10,8 @@ import ( "sync" "unsafe" - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" ) var ( diff --git a/interop/interop_api.go b/interop/interop_api.go index f152c924a..69c12d00f 100644 --- a/interop/interop_api.go +++ b/interop/interop_api.go @@ -4,7 +4,7 @@ import ( "encoding/json" "sync" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt/core" ) var ( diff --git a/interop/interop_api_helper.go b/interop/interop_api_helper.go index 7d9f18bd7..f35aabbcc 100644 --- a/interop/interop_api_helper.go +++ b/interop/interop_api_helper.go @@ -4,7 +4,7 @@ import ( "encoding/json" "strings" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt/core" ) func genPseudoIn(s string) *PseudoQJSValue { diff --git a/interop/pseudo.go b/interop/pseudo.go index e5366a127..d5f5ece15 100644 --- a/interop/pseudo.go +++ b/interop/pseudo.go @@ -1,6 +1,6 @@ package interop -import "github.com/therecipe/qt" +import "github.com/StarAurryon/qt" func init() { qt.ItfMap["interop.PseudoQJSEngine_ITF"] = PseudoQJSEngine{} diff --git a/interop/pseudo_engine.go b/interop/pseudo_engine.go index c65c2ee52..9a7a49dcc 100644 --- a/interop/pseudo_engine.go +++ b/interop/pseudo_engine.go @@ -3,9 +3,9 @@ package interop import ( "unsafe" - "github.com/therecipe/qt" + "github.com/StarAurryon/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt/core" ) //TODO: this == nil checks diff --git a/interop/pseudo_value.go b/interop/pseudo_value.go index 635292509..6431960b1 100644 --- a/interop/pseudo_value.go +++ b/interop/pseudo_value.go @@ -3,9 +3,9 @@ package interop import ( "encoding/json" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt/core" - "github.com/therecipe/qt" + "github.com/StarAurryon/qt" ) //TODO: this == nil checks diff --git a/interop/swift/swift.go b/interop/swift/swift.go index 20e3a8d41..e45f8459b 100644 --- a/interop/swift/swift.go +++ b/interop/swift/swift.go @@ -1,6 +1,6 @@ package swift -import "github.com/therecipe/qt/interop" +import "github.com/StarAurryon/qt/interop" func init() { interop.ReturnPointersAsStrings = true diff --git a/location/location.go b/location/location.go index 51322a105..96ea8d676 100644 --- a/location/location.go +++ b/location/location.go @@ -8,9 +8,9 @@ package location //#include "location.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/positioning" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/positioning" "strings" "unsafe" ) diff --git a/macextras/macextras.go b/macextras/macextras.go index 196d5f34e..4219e0b8b 100644 --- a/macextras/macextras.go +++ b/macextras/macextras.go @@ -8,9 +8,9 @@ package macextras //#include "macextras.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" "strings" "unsafe" ) diff --git a/multimedia/multimedia.go b/multimedia/multimedia.go index fc11504af..54b9a7463 100644 --- a/multimedia/multimedia.go +++ b/multimedia/multimedia.go @@ -8,11 +8,11 @@ package multimedia //#include "multimedia.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/network" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/network" + "github.com/StarAurryon/qt/widgets" "strings" "unsafe" ) diff --git a/network/network.go b/network/network.go index 100a90033..a2528f316 100644 --- a/network/network.go +++ b/network/network.go @@ -8,8 +8,8 @@ package network //#include "network.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" "reflect" "strings" "unsafe" diff --git a/nfc/nfc.go b/nfc/nfc.go index fa9229204..466ff601c 100644 --- a/nfc/nfc.go +++ b/nfc/nfc.go @@ -8,8 +8,8 @@ package nfc //#include "nfc.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" "strings" "unsafe" ) diff --git a/positioning/positioning.go b/positioning/positioning.go index e9b413044..1a0958869 100644 --- a/positioning/positioning.go +++ b/positioning/positioning.go @@ -8,8 +8,8 @@ package positioning //#include "positioning.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" "strings" "unsafe" ) diff --git a/printsupport/printsupport.go b/printsupport/printsupport.go index 1d3bad6c1..5463ee7fc 100644 --- a/printsupport/printsupport.go +++ b/printsupport/printsupport.go @@ -8,10 +8,10 @@ package printsupport //#include "printsupport.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/widgets" "strings" "unsafe" ) diff --git a/purchasing/purchasing.go b/purchasing/purchasing.go index a6853f6f8..a41fe3a7a 100644 --- a/purchasing/purchasing.go +++ b/purchasing/purchasing.go @@ -8,8 +8,8 @@ package purchasing //#include "purchasing.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" "strings" "unsafe" ) diff --git a/qml/qml.go b/qml/qml.go index bfa98f58c..84b268368 100644 --- a/qml/qml.go +++ b/qml/qml.go @@ -8,9 +8,9 @@ package qml //#include "qml.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/network" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/network" "strconv" "strings" "sync" diff --git a/qml/utils-qml.go b/qml/utils-qml.go index 936b818ee..a9136deb8 100644 --- a/qml/utils-qml.go +++ b/qml/utils-qml.go @@ -10,8 +10,8 @@ import ( "sync" "unsafe" - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" ) var ( diff --git a/quick/quick.go b/quick/quick.go index 97fc3c3a9..30320b559 100644 --- a/quick/quick.go +++ b/quick/quick.go @@ -8,11 +8,11 @@ package quick //#include "quick.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/qml" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/qml" + "github.com/StarAurryon/qt/widgets" "strings" "unsafe" ) diff --git a/quickcontrols2/quickcontrols2.go b/quickcontrols2/quickcontrols2.go index 7bc8110a8..6ae60af2e 100644 --- a/quickcontrols2/quickcontrols2.go +++ b/quickcontrols2/quickcontrols2.go @@ -8,8 +8,8 @@ package quickcontrols2 //#include "quickcontrols2.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" "strings" "unsafe" ) diff --git a/remoteobjects/remoteobjects.go b/remoteobjects/remoteobjects.go index 4074ab9c1..96dca6344 100644 --- a/remoteobjects/remoteobjects.go +++ b/remoteobjects/remoteobjects.go @@ -8,8 +8,8 @@ package remoteobjects //#include "remoteobjects.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" "strings" "unsafe" ) diff --git a/sailfish/sailfish.go b/sailfish/sailfish.go index 713b38ec8..ac4b7a1c9 100644 --- a/sailfish/sailfish.go +++ b/sailfish/sailfish.go @@ -3,10 +3,10 @@ package sailfish import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" "strings" "unsafe" ) diff --git a/sailfish/sailfish_sailfish.go b/sailfish/sailfish_sailfish.go index 9d1b30bef..ca6ed9bd9 100644 --- a/sailfish/sailfish_sailfish.go +++ b/sailfish/sailfish_sailfish.go @@ -8,10 +8,10 @@ package sailfish //#include "sailfish_sailfish.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/quick" "strings" "unsafe" ) diff --git a/script/script.go b/script/script.go index b2fe0cf7a..9f311f59a 100644 --- a/script/script.go +++ b/script/script.go @@ -8,8 +8,8 @@ package script //#include "script.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" "strings" "unsafe" ) diff --git a/scripttools/scripttools.go b/scripttools/scripttools.go index 5538b38b2..99d6a0c0b 100644 --- a/scripttools/scripttools.go +++ b/scripttools/scripttools.go @@ -8,10 +8,10 @@ package scripttools //#include "scripttools.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/script" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/script" + "github.com/StarAurryon/qt/widgets" "strings" "unsafe" ) diff --git a/scxml/scxml.go b/scxml/scxml.go index af5535576..5f591730e 100644 --- a/scxml/scxml.go +++ b/scxml/scxml.go @@ -8,8 +8,8 @@ package scxml //#include "scxml.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" "strings" "unsafe" ) diff --git a/sensors/sensors.go b/sensors/sensors.go index 0a8453620..1f46b0e33 100644 --- a/sensors/sensors.go +++ b/sensors/sensors.go @@ -8,8 +8,8 @@ package sensors //#include "sensors.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" "strings" "unsafe" ) diff --git a/serialbus/serialbus.go b/serialbus/serialbus.go index 169c4da61..2e54bd943 100644 --- a/serialbus/serialbus.go +++ b/serialbus/serialbus.go @@ -8,9 +8,9 @@ package serialbus //#include "serialbus.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/network" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/network" "strings" "unsafe" ) diff --git a/serialport/serialport.go b/serialport/serialport.go index dbf204259..03806f10f 100644 --- a/serialport/serialport.go +++ b/serialport/serialport.go @@ -8,8 +8,8 @@ package serialport //#include "serialport.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" "reflect" "strings" "unsafe" diff --git a/speech/speech.go b/speech/speech.go index 8620f93dc..1f6f02181 100644 --- a/speech/speech.go +++ b/speech/speech.go @@ -8,8 +8,8 @@ package speech //#include "speech.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" "strings" "unsafe" ) diff --git a/sql/sql.go b/sql/sql.go index fb0711d08..4c7c7a1a3 100644 --- a/sql/sql.go +++ b/sql/sql.go @@ -8,10 +8,10 @@ package sql //#include "sql.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/widgets" "strings" "unsafe" ) diff --git a/svg/svg.go b/svg/svg.go index 89dce104e..868c7cdf8 100644 --- a/svg/svg.go +++ b/svg/svg.go @@ -8,10 +8,10 @@ package svg //#include "svg.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/widgets" "strings" "unsafe" ) diff --git a/testlib/testlib.go b/testlib/testlib.go index ccaeba413..ca404887e 100644 --- a/testlib/testlib.go +++ b/testlib/testlib.go @@ -8,9 +8,9 @@ package testlib //#include "testlib.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/widgets" "strings" "unsafe" ) diff --git a/uitools/uitools.go b/uitools/uitools.go index c41307352..a8c4d7fd3 100644 --- a/uitools/uitools.go +++ b/uitools/uitools.go @@ -8,9 +8,9 @@ package uitools //#include "uitools.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/widgets" "strings" "unsafe" ) diff --git a/virtualkeyboard/virtualkeyboard.go b/virtualkeyboard/virtualkeyboard.go index 91cb89efc..2370219a4 100644 --- a/virtualkeyboard/virtualkeyboard.go +++ b/virtualkeyboard/virtualkeyboard.go @@ -8,8 +8,8 @@ package virtualkeyboard //#include "virtualkeyboard.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" "strings" "unsafe" ) diff --git a/webchannel/webchannel.go b/webchannel/webchannel.go index 9658f78fb..6908a42d8 100644 --- a/webchannel/webchannel.go +++ b/webchannel/webchannel.go @@ -8,8 +8,8 @@ package webchannel //#include "webchannel.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" "strings" "unsafe" ) diff --git a/webengine/webengine.go b/webengine/webengine.go index a3b70bb1e..f8277fffc 100644 --- a/webengine/webengine.go +++ b/webengine/webengine.go @@ -8,13 +8,13 @@ package webengine //#include "webengine.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/network" - "github.com/therecipe/qt/printsupport" - "github.com/therecipe/qt/webchannel" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/network" + "github.com/StarAurryon/qt/printsupport" + "github.com/StarAurryon/qt/webchannel" + "github.com/StarAurryon/qt/widgets" "strings" "unsafe" ) diff --git a/webkit/webkit.go b/webkit/webkit.go index 5849fbb84..bf52fd41a 100644 --- a/webkit/webkit.go +++ b/webkit/webkit.go @@ -8,12 +8,12 @@ package webkit //#include "webkit.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/network" - "github.com/therecipe/qt/printsupport" - "github.com/therecipe/qt/widgets" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" + "github.com/StarAurryon/qt/network" + "github.com/StarAurryon/qt/printsupport" + "github.com/StarAurryon/qt/widgets" "runtime" "strings" "unsafe" diff --git a/websockets/websockets.go b/websockets/websockets.go index dd3df3448..740d16fef 100644 --- a/websockets/websockets.go +++ b/websockets/websockets.go @@ -8,9 +8,9 @@ package websockets //#include "websockets.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/network" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/network" "strings" "unsafe" ) diff --git a/webview/webview.go b/webview/webview.go index e4b0b4d6e..84904f7ee 100644 --- a/webview/webview.go +++ b/webview/webview.go @@ -8,8 +8,8 @@ package webview //#include "webview.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" "strings" "unsafe" ) diff --git a/widgets/widgets.go b/widgets/widgets.go index 7894b7b31..b423d772d 100644 --- a/widgets/widgets.go +++ b/widgets/widgets.go @@ -8,9 +8,9 @@ package widgets //#include "widgets.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/gui" "strings" "unsafe" ) diff --git a/xml/xml.go b/xml/xml.go index 419b70cb6..0ed5ac2d9 100644 --- a/xml/xml.go +++ b/xml/xml.go @@ -8,8 +8,8 @@ package xml //#include "xml.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" "strings" "unsafe" ) diff --git a/xmlpatterns/xmlpatterns.go b/xmlpatterns/xmlpatterns.go index 125f453e7..a166209a3 100644 --- a/xmlpatterns/xmlpatterns.go +++ b/xmlpatterns/xmlpatterns.go @@ -8,9 +8,9 @@ package xmlpatterns //#include "xmlpatterns.h" import "C" import ( - "github.com/therecipe/qt" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/network" + "github.com/StarAurryon/qt" + "github.com/StarAurryon/qt/core" + "github.com/StarAurryon/qt/network" "strings" "unsafe" ) From 6b5e216d4da0818e4803344a91f43d447131c570 Mon Sep 17 00:00:00 2001 From: REDDY PRASAD Date: Thu, 7 Jan 2021 14:13:32 +0530 Subject: [PATCH 5/9] =?UTF-8?q?=F0=9F=90=9B=20Fix=20panic=20while=20access?= =?UTF-8?q?ing=20selected=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- widgets/widgets.go | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/widgets/widgets.go b/widgets/widgets.go index e323bbe46..b425d4129 100644 --- a/widgets/widgets.go +++ b/widgets/widgets.go @@ -3,11 +3,12 @@ package widgets import ( + "unsafe" + "github.com/therecipe/qt/core" "github.com/therecipe/qt/gui" "github.com/therecipe/qt/internal" "github.com/therecipe/qt/interop/gow" - "unsafe" ) type QAbstractButton struct { @@ -19,6 +20,23 @@ type QAbstractButton_ITF interface { QAbstractButton_PTR() *QAbstractButton } +func interfaceToStringArray(i interface{}) []string { + switch i.(type) { + case interface{}: + return i.([]string) + + case []interface{}: + ifs := i.([]interface{}) + o := []string{} + for _, fn := range ifs { + o = append(o, fn.(string)) + } + return o + default: + panic("expected interface or []interface, but got something else") + } +} + func (ptr *QAbstractButton) QAbstractButton_PTR() *QAbstractButton { return ptr } @@ -13049,12 +13067,12 @@ func (ptr *QFileDialog) GetOpenFileName(parent QWidget_ITF, caption string, dir func QFileDialog_GetOpenFileNames(parent QWidget_ITF, caption string, dir string, filter string, selectedFilter string, options QFileDialog__Option) []string { - return internal.CallLocalFunction([]interface{}{"", "", "widgets.QFileDialog_GetOpenFileNames", "", parent, caption, dir, filter, selectedFilter, options}).([]string) + return interfaceToStringArray(internal.CallLocalFunction([]interface{}{"", "", "widgets.QFileDialog_GetOpenFileNames", "", parent, caption, dir, filter, selectedFilter, options})) } func (ptr *QFileDialog) GetOpenFileNames(parent QWidget_ITF, caption string, dir string, filter string, selectedFilter string, options QFileDialog__Option) []string { - return internal.CallLocalFunction([]interface{}{"", "", "widgets.QFileDialog_GetOpenFileNames", "", parent, caption, dir, filter, selectedFilter, options}).([]string) + return interfaceToStringArray(internal.CallLocalFunction([]interface{}{"", "", "widgets.QFileDialog_GetOpenFileNames", "", parent, caption, dir, filter, selectedFilter, options})) } func QFileDialog_GetOpenFileUrl(parent QWidget_ITF, caption string, dir core.QUrl_ITF, filter string, selectedFilter string, options QFileDialog__Option, supportedSchemes []string) *core.QUrl { @@ -13189,7 +13207,7 @@ func (ptr *QFileDialog) SelectUrl(url core.QUrl_ITF) { func (ptr *QFileDialog) SelectedFiles() []string { - return internal.CallLocalFunction([]interface{}{"", uintptr(ptr.Pointer()), ptr.ClassNameInternalF(), "SelectedFiles"}).([]string) + return interfaceToStringArray(internal.CallLocalFunction([]interface{}{"", uintptr(ptr.Pointer()), ptr.ClassNameInternalF(), "SelectedFiles"})) } func (ptr *QFileDialog) SelectedMimeTypeFilter() string { From 1cf46945cfa06b52ffb8ba782fd2da694efc04a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Zawadzki?= Date: Mon, 23 Jan 2023 15:14:20 +0100 Subject: [PATCH 6/9] More updated of the github path --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 02c47bc67..0c89172b4 100644 --- a/README.md +++ b/README.md @@ -27,19 +27,19 @@ The following instructions assume that you already installed [Go](https://golang ```powershell set GO111MODULE=off -go get -v github.com/bluszcz/qt/cmd/... && for /f %v in ('go env GOPATH') do %v\bin\qtsetup test && %v\bin\qtsetup -test=false +go get -v github.com/bluszcz/cutego/cmd/... && for /f %v in ('go env GOPATH') do %v\bin\qtsetup test && %v\bin\qtsetup -test=false ``` ##### macOS [(more info)](https://github.com/bluszcz/cutego/wiki/Installation-on-macOS) ```bash -export GO111MODULE=off; xcode-select --install; go get -v github.com/bluszcz/qt/cmd/... && $(go env GOPATH)/bin/qtsetup test && $(go env GOPATH)/bin/qtsetup -test=false +export GO111MODULE=off; xcode-select --install; go get -v github.com/bluszcz/cutego/cmd/... && $(go env GOPATH)/bin/qtsetup test && $(go env GOPATH)/bin/qtsetup -test=false ``` ##### Linux [(more info)](https://github.com/bluszcz/cutego/wiki/Installation-on-Linux) ```bash -export GO111MODULE=off; go get -v github.com/bluszcz/qt/cmd/... && $(go env GOPATH)/bin/qtsetup test && $(go env GOPATH)/bin/qtsetup -test=false +export GO111MODULE=off; go get -v github.com/bluszcz/cutego/cmd/... && $(go env GOPATH)/bin/qtsetup test && $(go env GOPATH)/bin/qtsetup -test=false ``` Resources From 55063687c652fe4a40bab014a36e874af2437d9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Zawadzki?= Date: Mon, 23 Jan 2023 15:18:07 +0100 Subject: [PATCH 7/9] Merge: https://github.com/therecipe/qt/pull/1048/files --- internal/cmd/deploy/build_escape.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/cmd/deploy/build_escape.go b/internal/cmd/deploy/build_escape.go index 39aee32cd..a32d37d6f 100644 --- a/internal/cmd/deploy/build_escape.go +++ b/internal/cmd/deploy/build_escape.go @@ -31,8 +31,9 @@ func escapeFlags(ldFlags []string, ldFlagsCustom string) string { ldFlags = append(ldFlags, strings.Split(ldFlagsCustom, " ")...) } - if out := strings.Replace(strings.Join(ldFlags, "\" \""), "_DONT_ESCAPE_", " ", -1); len(out) > 0 { - return fmt.Sprintf("\"%v\"", out) + if out := strings.Replace(strings.Join(ldFlags, " "), "_DONT_ESCAPE_", " ", -1); len(out) > 0 { + return fmt.Sprintf("%q", out) } + return "" } From 5aaf306e075587ff4067e42093a8a132c8a0b976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Zawadzki?= Date: Thu, 2 Feb 2023 10:38:44 +0100 Subject: [PATCH 8/9] Change source --- README.md | 4 +-- internal/binding/parser/class_add.go | 2 +- internal/binding/templater/template_go.go | 4 +-- internal/cmd/cmd.go | 2 +- internal/docker/android/Dockerfile | 14 +++++----- internal/docker/darwin/Dockerfile.static | 2 +- internal/docker/darwin/build.sh | 2 +- internal/docker/darwin/build_static.sh | 2 +- internal/docker/darwin/build_static_base.sh | 2 +- internal/docker/darwin/save.sh | 2 +- .../docker_darwin_static_base_template.yml | 2 +- internal/docker/docker_job_template.yml | 4 +-- internal/docker/js/Dockerfile.js | 6 ++-- internal/docker/js/Dockerfile.js_thread | 6 ++-- internal/docker/js/Dockerfile.wasm | 12 ++++---- internal/docker/js/Dockerfile.wasm_thread | 12 ++++---- internal/docker/linux/Dockerfile.static | 4 +-- internal/docker/rpi/Dockerfile.base | 6 ++-- internal/docker/rpi/Dockerfile.rpi1 | 2 +- internal/docker/rpi/Dockerfile.rpi2 | 2 +- internal/docker/rpi/Dockerfile.rpi3 | 2 +- internal/docker/ubports/Dockerfile.64_vivid | 6 ++-- internal/docker/ubports/Dockerfile.64_xenial | 6 ++-- internal/docker/ubports/Dockerfile.arm_vivid | 6 ++-- internal/docker/ubports/Dockerfile.arm_xenial | 6 ++-- internal/docker/windows_32_shared/Dockerfile | 8 +++--- internal/docker/windows_32_static/Dockerfile | 8 +++--- internal/docker/windows_64_shared/Dockerfile | 8 +++--- internal/docker/windows_64_static/Dockerfile | 8 +++--- .../windows_legacy/Dockerfile.32_shared | 6 ++-- .../windows_legacy/Dockerfile.32_static | 6 ++-- .../windows_legacy/Dockerfile.64_shared | 6 ++-- .../windows_legacy/Dockerfile.64_static | 6 ++-- internal/docker/wine/Dockerfile | 2 +- internal/docker/wine/Dockerfile.32 | 2 +- internal/docker/wine/Dockerfile.32_shared | 2 +- internal/docker/wine/Dockerfile.32_static | 4 +-- internal/docker/wine/Dockerfile.512 | 2 +- internal/docker/wine/Dockerfile.56 | 2 +- internal/docker/wine/Dockerfile.56_xp | 2 +- internal/docker/wine/Dockerfile.59 | 2 +- internal/docker/wine/Dockerfile.64_msvc | 2 +- internal/docker/wine/Dockerfile.64_shared | 2 +- internal/docker/wine/Dockerfile.64_static | 4 +-- internal/examples/3rdparty/mpv/demo/main.go | 8 +++--- internal/examples/3rdparty/mpv/mpv.go | 6 ++-- internal/vagrant/docker/Vagrantfile | 28 +++++++++---------- interop/gow/gow.go | 2 +- 48 files changed, 122 insertions(+), 122 deletions(-) diff --git a/README.md b/README.md index 0c89172b4..e9594a988 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,9 @@ Introduction [Go](https://en.wikipedia.org/wiki/Go_(programming_language)), also known as Golang, is a programming language designed at Google. -[therecipe/qt](https://github.com/bluszcz/cutego) allows you to write Qt applications entirely in Go or JavaScript. +[bluszcz/cutego](https://github.com/bluszcz/cutego) allows you to write Qt applications entirely in Go or JavaScript. -Beside the language bindings provided, `therecipe/qt` also greatly simplifies the deployment of Qt applications to various software and hardware platforms. +Beside the language bindings provided, `bluszcz/cutego` also greatly simplifies the deployment of Qt applications to various software and hardware platforms. At the time of writing, almost all Qt functions and classes are accessible, and you should be able to find everything you need to build fully featured Qt applications. diff --git a/internal/binding/parser/class_add.go b/internal/binding/parser/class_add.go index de34ad93d..25ad194b0 100644 --- a/internal/binding/parser/class_add.go +++ b/internal/binding/parser/class_add.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/therecipe/qt/internal/utils" + "github.com/bluszcz/cutego/internal/utils" ) func (c *Class) add() { diff --git a/internal/binding/templater/template_go.go b/internal/binding/templater/template_go.go index ccd7a6cbf..feb2bedf5 100644 --- a/internal/binding/templater/template_go.go +++ b/internal/binding/templater/template_go.go @@ -1502,10 +1502,10 @@ import "C" fmt.Fprintln(bb, "\"github.com/bluszcz/cutego\"") case "internal": - fmt.Fprintln(bb, "\"github.com/therecipe/qt/internal\"") + fmt.Fprintln(bb, "\"github.com/bluszcz/cutego/internal\"") case "gow": - fmt.Fprintln(bb, "\"github.com/therecipe/qt/interop/gow\"") + fmt.Fprintln(bb, "\"github.com/bluszcz/cutego/interop/gow\"") case "js": if parser.UseWasm() { diff --git a/internal/cmd/cmd.go b/internal/cmd/cmd.go index 1352c8399..8db2b0fcf 100644 --- a/internal/cmd/cmd.go +++ b/internal/cmd/cmd.go @@ -271,7 +271,7 @@ func Vagrant(arg []string, target, path string, writeCacheToHost bool, system st } func virtual(arg []string, target, path string, writeCacheToHost bool, docker bool, system string) { - dUser := "therecipe/qt" + dUser := "bluszcz/cutego" if strings.Contains(target, ":") { dUser = strings.Split(target, ":")[0] target = strings.Split(target, ":")[1] diff --git a/internal/docker/android/Dockerfile b/internal/docker/android/Dockerfile index dc06a954b..534e6847f 100644 --- a/internal/docker/android/Dockerfile +++ b/internal/docker/android/Dockerfile @@ -39,13 +39,13 @@ ENV QT_VERSION 5.13.0 ENV QT_DIR /opt/Qt5.13.0 ENV QT_DOCKER true -COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go -COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt -COPY --from=therecipe/qt:linux /opt/Qt5.13.0/5.13.0/android_armv7 /opt/Qt5.13.0/5.13.0/android_armv7 -COPY --from=therecipe/qt:linux /opt/Qt5.13.0/5.13.0/android_x86 /opt/Qt5.13.0/5.13.0/android_x86 -COPY --from=therecipe/qt:linux /opt/Qt5.13.0/5.13.0/android_arm64_v8a /opt/Qt5.13.0/5.13.0/android_arm64_v8a -COPY --from=therecipe/qt:linux /opt/Qt5.13.0/Docs /opt/Qt5.13.0/Docs +COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go +COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin +COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt +COPY --from=bluszcz/cutego:linux /opt/Qt5.13.0/5.13.0/android_armv7 /opt/Qt5.13.0/5.13.0/android_armv7 +COPY --from=bluszcz/cutego:linux /opt/Qt5.13.0/5.13.0/android_x86 /opt/Qt5.13.0/5.13.0/android_x86 +COPY --from=bluszcz/cutego:linux /opt/Qt5.13.0/5.13.0/android_arm64_v8a /opt/Qt5.13.0/5.13.0/android_arm64_v8a +COPY --from=bluszcz/cutego:linux /opt/Qt5.13.0/Docs /opt/Qt5.13.0/Docs COPY --from=base $HOME/android-sdk-linux $HOME/android-sdk-linux COPY --from=base $HOME/android-ndk-r18b $HOME/android-ndk-r18b COPY --from=base $HOME/openssl-1.1.1a-arm $HOME/openssl-1.1.1a-arm diff --git a/internal/docker/darwin/Dockerfile.static b/internal/docker/darwin/Dockerfile.static index 73437f5a4..e3b719de2 100644 --- a/internal/docker/darwin/Dockerfile.static +++ b/internal/docker/darwin/Dockerfile.static @@ -14,7 +14,7 @@ RUN cd /osxcross && OSX_VERSION_MIN=10.12 UNATTENDED=1 ./build.sh RUN cd /osxcross && ./target/bin/o64-clang++-libc++ -o osxcross ./oclang/test_libcxx.cpp -FROM therecipe/qt:darwin_static_base +FROM bluszcz/cutego:darwin_static_base LABEL maintainer therecipe ENV USER user diff --git a/internal/docker/darwin/build.sh b/internal/docker/darwin/build.sh index a0aac4208..36604f69c 100755 --- a/internal/docker/darwin/build.sh +++ b/internal/docker/darwin/build.sh @@ -4,4 +4,4 @@ if [ ! -f MacOSX*.sdk.tar.xz ]; then GP=gen_sdk_package.sh && curl -sL --retry 10 --retry-delay 60 -O https://raw.githubusercontent.com/tpoechtrager/osxcross/master/tools/$GP && chmod +x $GP && ./$GP && rm $GP fi -docker build -f Dockerfile -t therecipe/qt:darwin . +docker build -f Dockerfile -t bluszcz/cutego:darwin . diff --git a/internal/docker/darwin/build_static.sh b/internal/docker/darwin/build_static.sh index 2e5e789b9..cc8320c50 100755 --- a/internal/docker/darwin/build_static.sh +++ b/internal/docker/darwin/build_static.sh @@ -4,4 +4,4 @@ if [ ! -f MacOSX*.sdk.tar.xz ]; then GP=gen_sdk_package.sh && curl -sL --retry 10 --retry-delay 60 -O https://raw.githubusercontent.com/tpoechtrager/osxcross/master/tools/$GP && chmod +x $GP && ./$GP && rm $GP fi -docker build -f Dockerfile.static -t therecipe/qt:darwin_static . +docker build -f Dockerfile.static -t bluszcz/cutego:darwin_static . diff --git a/internal/docker/darwin/build_static_base.sh b/internal/docker/darwin/build_static_base.sh index 38a83dd33..ecd793bb6 100755 --- a/internal/docker/darwin/build_static_base.sh +++ b/internal/docker/darwin/build_static_base.sh @@ -53,4 +53,4 @@ zip -r ${PREF}.zip $PREF && rm -rf $PREF du -sh ${PREF}.zip -docker build -f Dockerfile.static_base -t therecipe/qt:darwin_static_base . +docker build -f Dockerfile.static_base -t bluszcz/cutego:darwin_static_base . diff --git a/internal/docker/darwin/save.sh b/internal/docker/darwin/save.sh index d5cc326c7..b5a83f95d 100755 --- a/internal/docker/darwin/save.sh +++ b/internal/docker/darwin/save.sh @@ -1,3 +1,3 @@ #!/bin/bash -docker save therecipe/qt:darwin | gzip -n > darwin.tar.gz +docker save bluszcz/cutego:darwin | gzip -n > darwin.tar.gz diff --git a/internal/docker/docker_darwin_static_base_template.yml b/internal/docker/docker_darwin_static_base_template.yml index 857b21ace..9844c5b89 100644 --- a/internal/docker/docker_darwin_static_base_template.yml +++ b/internal/docker/docker_darwin_static_base_template.yml @@ -17,4 +17,4 @@ jobs: - script: 'cd internal/docker/darwin && ./build_static_base.sh' - - script: 'docker login -u therecipe -p $(DOCKER_PASSWORD) && docker push therecipe/qt:${{ parameters.tag }} && docker logout' + script: 'docker login -u therecipe -p $(DOCKER_PASSWORD) && docker push bluszcz/cutego:${{ parameters.tag }} && docker logout' diff --git a/internal/docker/docker_job_template.yml b/internal/docker/docker_job_template.yml index f7a4c6c78..82a120159 100644 --- a/internal/docker/docker_job_template.yml +++ b/internal/docker/docker_job_template.yml @@ -9,6 +9,6 @@ jobs: - script: 'sudo df -h; sudo rm -rf /usr/share/dotnet; sudo df -h;' - - script: 'docker build --force-rm -f internal/docker/${{ parameters.file }} -t therecipe/qt:${{ parameters.tag }} .' + script: 'docker build --force-rm -f internal/docker/${{ parameters.file }} -t bluszcz/cutego:${{ parameters.tag }} .' - - script: 'docker login -u therecipe -p $(DOCKER_PASSWORD) && docker push therecipe/qt:${{ parameters.tag }} && docker logout' + script: 'docker login -u therecipe -p $(DOCKER_PASSWORD) && docker push bluszcz/cutego:${{ parameters.tag }} && docker logout' diff --git a/internal/docker/js/Dockerfile.js b/internal/docker/js/Dockerfile.js index 761dd5e5c..2b7fbfcdd 100644 --- a/internal/docker/js/Dockerfile.js +++ b/internal/docker/js/Dockerfile.js @@ -23,9 +23,9 @@ ENV QT_QMAKE_DIR /usr/local/Qt-5.13.0/bin COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt -COPY --from=therecipe/qt:js_base $HOME/emsdk $HOME/emsdk -COPY --from=therecipe/qt:js_base $HOME/.emscripten $HOME/.emscripten -COPY --from=therecipe/qt:js_base /usr/local/Qt-5.13.0 /usr/local/Qt-5.13.0 +COPY --from=bluszcz/cutego:js_base $HOME/emsdk $HOME/emsdk +COPY --from=bluszcz/cutego:js_base $HOME/.emscripten $HOME/.emscripten +COPY --from=bluszcz/cutego:js_base /usr/local/Qt-5.13.0 /usr/local/Qt-5.13.0 RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install python2.7 nodejs cmake default-jre && apt-get -qq clean RUN ln -s /usr/bin/python2.7 /usr/bin/python diff --git a/internal/docker/js/Dockerfile.js_thread b/internal/docker/js/Dockerfile.js_thread index 68558e57f..eda88ceda 100644 --- a/internal/docker/js/Dockerfile.js_thread +++ b/internal/docker/js/Dockerfile.js_thread @@ -23,9 +23,9 @@ ENV QT_QMAKE_DIR /usr/local/Qt-5.13.0/bin COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt -COPY --from=therecipe/qt:js_base_thread $HOME/emsdk $HOME/emsdk -COPY --from=therecipe/qt:js_base_thread $HOME/.emscripten $HOME/.emscripten -COPY --from=therecipe/qt:js_base_thread /usr/local/Qt-5.13.0 /usr/local/Qt-5.13.0 +COPY --from=bluszcz/cutego:js_base_thread $HOME/emsdk $HOME/emsdk +COPY --from=bluszcz/cutego:js_base_thread $HOME/.emscripten $HOME/.emscripten +COPY --from=bluszcz/cutego:js_base_thread /usr/local/Qt-5.13.0 /usr/local/Qt-5.13.0 RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install python2.7 nodejs cmake default-jre && apt-get -qq clean RUN ln -s /usr/bin/python2.7 /usr/bin/python diff --git a/internal/docker/js/Dockerfile.wasm b/internal/docker/js/Dockerfile.wasm index b34690288..d3e69016e 100644 --- a/internal/docker/js/Dockerfile.wasm +++ b/internal/docker/js/Dockerfile.wasm @@ -9,12 +9,12 @@ ENV QT_API 5.13.0 ENV QT_DOCKER true ENV QT_QMAKE_DIR /usr/local/Qt-5.13.0/bin -COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go -COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt -COPY --from=therecipe/qt:js_base $HOME/emsdk $HOME/emsdk -COPY --from=therecipe/qt:js_base $HOME/.emscripten $HOME/.emscripten -COPY --from=therecipe/qt:js_base /usr/local/Qt-5.13.0 /usr/local/Qt-5.13.0 +COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go +COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin +COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt +COPY --from=bluszcz/cutego:js_base $HOME/emsdk $HOME/emsdk +COPY --from=bluszcz/cutego:js_base $HOME/.emscripten $HOME/.emscripten +COPY --from=bluszcz/cutego:js_base /usr/local/Qt-5.13.0 /usr/local/Qt-5.13.0 RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install python2.7 nodejs cmake default-jre && apt-get -qq clean RUN ln -s /usr/bin/python2.7 /usr/bin/python diff --git a/internal/docker/js/Dockerfile.wasm_thread b/internal/docker/js/Dockerfile.wasm_thread index 929f48fd8..0d67e8f13 100644 --- a/internal/docker/js/Dockerfile.wasm_thread +++ b/internal/docker/js/Dockerfile.wasm_thread @@ -9,12 +9,12 @@ ENV QT_API 5.13.0 ENV QT_DOCKER true ENV QT_QMAKE_DIR /usr/local/Qt-5.13.0/bin -COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go -COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt -COPY --from=therecipe/qt:js_base_thread $HOME/emsdk $HOME/emsdk -COPY --from=therecipe/qt:js_base_thread $HOME/.emscripten $HOME/.emscripten -COPY --from=therecipe/qt:js_base_thread /usr/local/Qt-5.13.0 /usr/local/Qt-5.13.0 +COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go +COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin +COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt +COPY --from=bluszcz/cutego:js_base_thread $HOME/emsdk $HOME/emsdk +COPY --from=bluszcz/cutego:js_base_thread $HOME/.emscripten $HOME/.emscripten +COPY --from=bluszcz/cutego:js_base_thread /usr/local/Qt-5.13.0 /usr/local/Qt-5.13.0 RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install python2.7 nodejs cmake default-jre && apt-get -qq clean RUN ln -s /usr/bin/python2.7 /usr/bin/python diff --git a/internal/docker/linux/Dockerfile.static b/internal/docker/linux/Dockerfile.static index bafb37f64..6f95b4f2b 100644 --- a/internal/docker/linux/Dockerfile.static +++ b/internal/docker/linux/Dockerfile.static @@ -9,7 +9,7 @@ RUN GO=go1.13.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O ht RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/... -FROM therecipe/qt:linux_static_base as fcitx +FROM bluszcz/cutego:linux_static_base as fcitx ENV CMAKE_PREFIX_PATH /opt/Qt/5.13.0/gcc_64/lib/cmake/Qt5/ @@ -41,7 +41,7 @@ ENV QT_STATIC true COPY --from=base /usr/local/go /usr/local/go COPY --from=base $GOPATH/bin $GOPATH/bin COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt -COPY --from=therecipe/qt:linux_static_base /opt/Qt/5.13.0 /opt/Qt/5.13.0 +COPY --from=bluszcz/cutego:linux_static_base /opt/Qt/5.13.0 /opt/Qt/5.13.0 COPY --from=fcitx /fcitx-qt5/platforminputcontext/libfcitxplatforminputcontextplugin.a /opt/Qt/5.13.0/gcc_64/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.a RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install build-essential libglib2.0-dev libglu1-mesa-dev libpulse-dev \ diff --git a/internal/docker/rpi/Dockerfile.base b/internal/docker/rpi/Dockerfile.base index 0431dc4db..36458c632 100644 --- a/internal/docker/rpi/Dockerfile.base +++ b/internal/docker/rpi/Dockerfile.base @@ -14,9 +14,9 @@ ENV RPI_TOOLS_DIR /opt/qtrpi/raspi/tools ENV RPI_COMPILER gcc-linaro-arm-linux-gnueabihf-raspbian-x64 -COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go -COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt +COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go +COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin +COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git make && apt-get -qq clean diff --git a/internal/docker/rpi/Dockerfile.rpi1 b/internal/docker/rpi/Dockerfile.rpi1 index 9b112da0d..d17802f98 100644 --- a/internal/docker/rpi/Dockerfile.rpi1 +++ b/internal/docker/rpi/Dockerfile.rpi1 @@ -1,4 +1,4 @@ -FROM therecipe/qt:rpi_base +FROM bluszcz/cutego:rpi_base LABEL maintainer therecipe diff --git a/internal/docker/rpi/Dockerfile.rpi2 b/internal/docker/rpi/Dockerfile.rpi2 index b6752bbc1..69ed6c87a 100644 --- a/internal/docker/rpi/Dockerfile.rpi2 +++ b/internal/docker/rpi/Dockerfile.rpi2 @@ -1,4 +1,4 @@ -FROM therecipe/qt:rpi_base +FROM bluszcz/cutego:rpi_base LABEL maintainer therecipe diff --git a/internal/docker/rpi/Dockerfile.rpi3 b/internal/docker/rpi/Dockerfile.rpi3 index 557e63ad1..f62ae054a 100644 --- a/internal/docker/rpi/Dockerfile.rpi3 +++ b/internal/docker/rpi/Dockerfile.rpi3 @@ -1,4 +1,4 @@ -FROM therecipe/qt:rpi_base +FROM bluszcz/cutego:rpi_base LABEL maintainer therecipe diff --git a/internal/docker/ubports/Dockerfile.64_vivid b/internal/docker/ubports/Dockerfile.64_vivid index a3d4657e1..e80c02bdd 100644 --- a/internal/docker/ubports/Dockerfile.64_vivid +++ b/internal/docker/ubports/Dockerfile.64_vivid @@ -12,9 +12,9 @@ ENV QT_UBPORTS_ARCH amd64 ENV QT_UBPORTS_VERSION vivid RUN rm -rf /usr/local/go || true -COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go -COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt +COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go +COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin +COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install qt*5-doc-html && apt-get -qq clean diff --git a/internal/docker/ubports/Dockerfile.64_xenial b/internal/docker/ubports/Dockerfile.64_xenial index 2cd0541b1..7332c66ea 100644 --- a/internal/docker/ubports/Dockerfile.64_xenial +++ b/internal/docker/ubports/Dockerfile.64_xenial @@ -12,9 +12,9 @@ ENV QT_UBPORTS_ARCH amd64 ENV QT_UBPORTS_VERSION xenial RUN rm -rf /usr/local/go || true -COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go -COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt +COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go +COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin +COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check ubports diff --git a/internal/docker/ubports/Dockerfile.arm_vivid b/internal/docker/ubports/Dockerfile.arm_vivid index 7297886a0..cb655c886 100644 --- a/internal/docker/ubports/Dockerfile.arm_vivid +++ b/internal/docker/ubports/Dockerfile.arm_vivid @@ -12,9 +12,9 @@ ENV QT_UBPORTS_ARCH arm ENV QT_UBPORTS_VERSION vivid RUN rm -rf /usr/local/go || true -COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go -COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt +COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go +COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin +COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install qt*5-doc-html && apt-get -qq clean diff --git a/internal/docker/ubports/Dockerfile.arm_xenial b/internal/docker/ubports/Dockerfile.arm_xenial index 1dcbaa0ab..b1055f1d0 100644 --- a/internal/docker/ubports/Dockerfile.arm_xenial +++ b/internal/docker/ubports/Dockerfile.arm_xenial @@ -12,9 +12,9 @@ ENV QT_UBPORTS_ARCH arm ENV QT_UBPORTS_VERSION xenial RUN rm -rf /usr/local/go || true -COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go -COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt +COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go +COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin +COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt RUN ln -s /usr/lib/arm-linux-gnueabihf/qt5/qt.conf /usr/lib/qt5/bin/ diff --git a/internal/docker/windows_32_shared/Dockerfile b/internal/docker/windows_32_shared/Dockerfile index 44fe4e2a5..20f80d4d2 100644 --- a/internal/docker/windows_32_shared/Dockerfile +++ b/internal/docker/windows_32_shared/Dockerfile @@ -10,10 +10,10 @@ ENV QT_MXE true ENV QT_MXE_ARCH 386 ENV QT_MXE_STATIC false -COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go -COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt -COPY --from=therecipe/qt:windows_32_shared_base /usr/lib/mxe /usr/lib/mxe +COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go +COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin +COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt +COPY --from=bluszcz/cutego:windows_32_shared_base /usr/lib/mxe /usr/lib/mxe RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check windows diff --git a/internal/docker/windows_32_static/Dockerfile b/internal/docker/windows_32_static/Dockerfile index d1114ee30..9ef2a4b98 100644 --- a/internal/docker/windows_32_static/Dockerfile +++ b/internal/docker/windows_32_static/Dockerfile @@ -10,10 +10,10 @@ ENV QT_MXE true ENV QT_MXE_ARCH 386 ENV QT_MXE_STATIC true -COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go -COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt -COPY --from=therecipe/qt:windows_32_static_base /usr/lib/mxe /usr/lib/mxe +COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go +COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin +COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt +COPY --from=bluszcz/cutego:windows_32_static_base /usr/lib/mxe /usr/lib/mxe RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check windows diff --git a/internal/docker/windows_64_shared/Dockerfile b/internal/docker/windows_64_shared/Dockerfile index 127f0523b..5ee027e79 100644 --- a/internal/docker/windows_64_shared/Dockerfile +++ b/internal/docker/windows_64_shared/Dockerfile @@ -10,10 +10,10 @@ ENV QT_MXE true ENV QT_MXE_ARCH amd64 ENV QT_MXE_STATIC false -COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go -COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt -COPY --from=therecipe/qt:windows_64_shared_base /usr/lib/mxe /usr/lib/mxe +COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go +COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin +COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt +COPY --from=bluszcz/cutego:windows_64_shared_base /usr/lib/mxe /usr/lib/mxe RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check windows diff --git a/internal/docker/windows_64_static/Dockerfile b/internal/docker/windows_64_static/Dockerfile index 673e2a1a0..31456a3ec 100644 --- a/internal/docker/windows_64_static/Dockerfile +++ b/internal/docker/windows_64_static/Dockerfile @@ -10,10 +10,10 @@ ENV QT_MXE true ENV QT_MXE_ARCH amd64 ENV QT_MXE_STATIC true -COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go -COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt -COPY --from=therecipe/qt:windows_64_static_base /usr/lib/mxe /usr/lib/mxe +COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go +COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin +COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt +COPY --from=bluszcz/cutego:windows_64_static_base /usr/lib/mxe /usr/lib/mxe RUN $GOPATH/bin/qtsetup prep RUN $GOPATH/bin/qtsetup check windows diff --git a/internal/docker/windows_legacy/Dockerfile.32_shared b/internal/docker/windows_legacy/Dockerfile.32_shared index 5a221c0b8..6bb1d8eb3 100644 --- a/internal/docker/windows_legacy/Dockerfile.32_shared +++ b/internal/docker/windows_legacy/Dockerfile.32_shared @@ -16,9 +16,9 @@ ENV QT_MXE true ENV QT_MXE_ARCH 386 ENV QT_MXE_STATIC false -COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go -COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt +COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go +COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin +COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt COPY --from=base /usr/lib/mxe /usr/lib/mxe RUN $GOPATH/bin/qtsetup prep diff --git a/internal/docker/windows_legacy/Dockerfile.32_static b/internal/docker/windows_legacy/Dockerfile.32_static index a4926c8fd..4344a3f80 100644 --- a/internal/docker/windows_legacy/Dockerfile.32_static +++ b/internal/docker/windows_legacy/Dockerfile.32_static @@ -16,9 +16,9 @@ ENV QT_MXE true ENV QT_MXE_ARCH 386 ENV QT_MXE_STATIC true -COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go -COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt +COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go +COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin +COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt COPY --from=base /usr/lib/mxe /usr/lib/mxe RUN $GOPATH/bin/qtsetup prep diff --git a/internal/docker/windows_legacy/Dockerfile.64_shared b/internal/docker/windows_legacy/Dockerfile.64_shared index 9d162f05e..d0a12a874 100644 --- a/internal/docker/windows_legacy/Dockerfile.64_shared +++ b/internal/docker/windows_legacy/Dockerfile.64_shared @@ -16,9 +16,9 @@ ENV QT_MXE true ENV QT_MXE_ARCH amd64 ENV QT_MXE_STATIC false -COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go -COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt +COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go +COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin +COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt COPY --from=base /usr/lib/mxe /usr/lib/mxe RUN $GOPATH/bin/qtsetup prep diff --git a/internal/docker/windows_legacy/Dockerfile.64_static b/internal/docker/windows_legacy/Dockerfile.64_static index 2eadd375c..dea884918 100644 --- a/internal/docker/windows_legacy/Dockerfile.64_static +++ b/internal/docker/windows_legacy/Dockerfile.64_static @@ -16,9 +16,9 @@ ENV QT_MXE true ENV QT_MXE_ARCH amd64 ENV QT_MXE_STATIC true -COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go -COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin -COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt +COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go +COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin +COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt COPY --from=base /usr/lib/mxe /usr/lib/mxe RUN $GOPATH/bin/qtsetup prep diff --git a/internal/docker/wine/Dockerfile b/internal/docker/wine/Dockerfile index cc494a6ac..6fdcc43c4 100644 --- a/internal/docker/wine/Dockerfile +++ b/internal/docker/wine/Dockerfile @@ -1,4 +1,4 @@ -FROM therecipe/qt:wine_base as base +FROM bluszcz/cutego:wine_base as base RUN QT=qt-opensource-windows-x86-5.13.0.exe && curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/official_releases/qt/5.13/5.13.0/$QT \ && QT_QPA_PLATFORM=minimal xvfb-run wine Z:\\$QT --no-force-installations --script=C:\\gopath\\src\\github.com\\therecipe\\qt\\internal\\ci\\iscript.qs WINDOWS=true && rm -f $QT diff --git a/internal/docker/wine/Dockerfile.32 b/internal/docker/wine/Dockerfile.32 index 8f6b1f5a2..cdd92f95f 100644 --- a/internal/docker/wine/Dockerfile.32 +++ b/internal/docker/wine/Dockerfile.32 @@ -1,4 +1,4 @@ -FROM therecipe/qt:wine_base as base +FROM bluszcz/cutego:wine_base as base RUN QT=qt-opensource-windows-x86-5.13.0.exe && curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/official_releases/qt/5.13/5.13.0/$QT \ && QT_QPA_PLATFORM=minimal xvfb-run wine Z:\\$QT --no-force-installations --script=C:\\gopath\\src\\github.com\\therecipe\\qt\\internal\\ci\\iscript.qs WINDOWS=true ARCH=32 && rm -f $QT diff --git a/internal/docker/wine/Dockerfile.32_shared b/internal/docker/wine/Dockerfile.32_shared index 12635e9fe..a306f8969 100644 --- a/internal/docker/wine/Dockerfile.32_shared +++ b/internal/docker/wine/Dockerfile.32_shared @@ -1,4 +1,4 @@ -FROM therecipe/qt:wine_base as base +FROM bluszcz/cutego:wine_base as base #TODO: use pacman instead diff --git a/internal/docker/wine/Dockerfile.32_static b/internal/docker/wine/Dockerfile.32_static index 974361678..75a07514a 100644 --- a/internal/docker/wine/Dockerfile.32_static +++ b/internal/docker/wine/Dockerfile.32_static @@ -1,4 +1,4 @@ -FROM therecipe/qt:wine_base as base +FROM bluszcz/cutego:wine_base as base #TODO: use pacman instead @@ -110,7 +110,7 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install winehq- RUN WINEDLLOVERRIDES="mscoree,mshtml=" wineboot && wineserver -w RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install patch && apt-get -qq clean -ADD https://raw.githubusercontent.com/therecipe/qt/master/internal/docker/wine/rspfile.patch $HOME/.wine/drive_c/go/rspfile.patch +ADD https://raw.githubusercontent.com/bluszcz/cutego/master/internal/docker/wine/rspfile.patch $HOME/.wine/drive_c/go/rspfile.patch RUN cd $HOME/.wine/drive_c/go && patch -p 1 < rspfile.patch RUN wine go install cmd/go cmd/link diff --git a/internal/docker/wine/Dockerfile.512 b/internal/docker/wine/Dockerfile.512 index 30058b444..a3708471d 100644 --- a/internal/docker/wine/Dockerfile.512 +++ b/internal/docker/wine/Dockerfile.512 @@ -1,4 +1,4 @@ -FROM therecipe/qt:wine_base as base +FROM bluszcz/cutego:wine_base as base RUN QT=qt-opensource-windows-x86-5.12.4.exe && curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/official_releases/qt/5.12/5.12.4/$QT \ && QT_QPA_PLATFORM=minimal xvfb-run wine Z:\\$QT --no-force-installations --script=C:\\gopath\\src\\github.com\\therecipe\\qt\\internal\\ci\\iscript.qs WINDOWS=true VERSION=qt5.5124 && rm -f $QT diff --git a/internal/docker/wine/Dockerfile.56 b/internal/docker/wine/Dockerfile.56 index 7ded0605b..b77353c5b 100644 --- a/internal/docker/wine/Dockerfile.56 +++ b/internal/docker/wine/Dockerfile.56 @@ -1,4 +1,4 @@ -FROM therecipe/qt:wine_base as base +FROM bluszcz/cutego:wine_base as base ENV QT qt-opensource-windows-x86-mingw492-5.6.3.exe RUN curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/new_archive/qt/5.6/5.6.3/$QT diff --git a/internal/docker/wine/Dockerfile.56_xp b/internal/docker/wine/Dockerfile.56_xp index 49b863521..9655316db 100644 --- a/internal/docker/wine/Dockerfile.56_xp +++ b/internal/docker/wine/Dockerfile.56_xp @@ -1,4 +1,4 @@ -FROM therecipe/qt:wine_base_xp as base +FROM bluszcz/cutego:wine_base_xp as base ENV QT qt-opensource-windows-x86-mingw492-5.6.3.exe RUN curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/new_archive/qt/5.6/5.6.3/$QT diff --git a/internal/docker/wine/Dockerfile.59 b/internal/docker/wine/Dockerfile.59 index 1e96bad04..a7c18b5e7 100644 --- a/internal/docker/wine/Dockerfile.59 +++ b/internal/docker/wine/Dockerfile.59 @@ -1,4 +1,4 @@ -FROM therecipe/qt:wine_base as base +FROM bluszcz/cutego:wine_base as base RUN QT=qt-opensource-windows-x86-5.9.6.exe && curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/official_releases/qt/5.9/5.9.6/$QT \ && QT_QPA_PLATFORM=minimal xvfb-run wine Z:\\$QT --no-force-installations --script=C:\\gopath\\src\\github.com\\therecipe\\qt\\internal\\ci\\iscript.qs WINDOWS=true VERSION=596 && rm -f $QT diff --git a/internal/docker/wine/Dockerfile.64_msvc b/internal/docker/wine/Dockerfile.64_msvc index c5fa9d2d9..8d2fcba68 100644 --- a/internal/docker/wine/Dockerfile.64_msvc +++ b/internal/docker/wine/Dockerfile.64_msvc @@ -1,4 +1,4 @@ -FROM therecipe/qt:wine_base as base +FROM bluszcz/cutego:wine_base as base RUN QT=qt-opensource-windows-x86-5.13.0.exe && curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/official_releases/qt/5.13/5.13.0/$QT \ && QT_QPA_PLATFORM=minimal xvfb-run wine Z:\\$QT --no-force-installations --script=C:\\gopath\\src\\github.com\\therecipe\\qt\\internal\\ci\\iscript.qs WINDOWS=true MSVC=true && rm -f $QT diff --git a/internal/docker/wine/Dockerfile.64_shared b/internal/docker/wine/Dockerfile.64_shared index 70a774f42..4360bd3f9 100644 --- a/internal/docker/wine/Dockerfile.64_shared +++ b/internal/docker/wine/Dockerfile.64_shared @@ -1,4 +1,4 @@ -FROM therecipe/qt:wine_base as base +FROM bluszcz/cutego:wine_base as base #TODO: use pacman instead diff --git a/internal/docker/wine/Dockerfile.64_static b/internal/docker/wine/Dockerfile.64_static index 240f98d47..eee847ef3 100644 --- a/internal/docker/wine/Dockerfile.64_static +++ b/internal/docker/wine/Dockerfile.64_static @@ -1,4 +1,4 @@ -FROM therecipe/qt:wine_base as base +FROM bluszcz/cutego:wine_base as base #TODO: use pacman instead @@ -110,7 +110,7 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install winehq- RUN WINEDLLOVERRIDES="mscoree,mshtml=" wineboot && wineserver -w RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install patch && apt-get -qq clean -ADD https://raw.githubusercontent.com/therecipe/qt/master/internal/docker/wine/rspfile.patch $HOME/.wine/drive_c/go/rspfile.patch +ADD https://raw.githubusercontent.com/bluszcz/cutego/master/internal/docker/wine/rspfile.patch $HOME/.wine/drive_c/go/rspfile.patch RUN cd $HOME/.wine/drive_c/go && patch -p 1 < rspfile.patch RUN wine go install cmd/go cmd/link diff --git a/internal/examples/3rdparty/mpv/demo/main.go b/internal/examples/3rdparty/mpv/demo/main.go index 6195f4240..c0d2a981e 100644 --- a/internal/examples/3rdparty/mpv/demo/main.go +++ b/internal/examples/3rdparty/mpv/demo/main.go @@ -5,11 +5,11 @@ package main import ( "os" - "github.com/therecipe/qt/core" - "github.com/therecipe/qt/gui" - "github.com/therecipe/qt/quick" + "github.com/bluszcz/cutego/core" + "github.com/bluszcz/cutego/gui" + "github.com/bluszcz/cutego/quick" - "github.com/therecipe/qt/internal/examples/3rdparty/mpv" + "github.com/bluszcz/cutego/internal/examples/3rdparty/mpv" ) func main() { diff --git a/internal/examples/3rdparty/mpv/mpv.go b/internal/examples/3rdparty/mpv/mpv.go index 3ffd13969..cd804d38d 100644 --- a/internal/examples/3rdparty/mpv/mpv.go +++ b/internal/examples/3rdparty/mpv/mpv.go @@ -3,7 +3,7 @@ package mpv //it's also possible to directly place this file beside the files from mpv-examples/libmpv/qml //to get this working, change init.go to just run `make mocables` //and remove the cgo LDFLAGS line used to link against the static lib below -//more info: https://github.com/therecipe/qt/issues/1162 +//more info: https://github.com/bluszcz/cutego/issues/1162 /* #cgo pkg-config: mpv @@ -13,8 +13,8 @@ void initMpv(); */ import "C" import ( - "github.com/therecipe/qt/core" - _ "github.com/therecipe/qt/quick" + "github.com/bluszcz/cutego/core" + _ "github.com/bluszcz/cutego/quick" ) type stub struct{ core.QObject } //TODO: needed for linking at the moment diff --git a/internal/vagrant/docker/Vagrantfile b/internal/vagrant/docker/Vagrantfile index f4459737b..307ce4b5e 100644 --- a/internal/vagrant/docker/Vagrantfile +++ b/internal/vagrant/docker/Vagrantfile @@ -13,85 +13,85 @@ Vagrant.configure("2") do |config| config.vm.define "linux" do |m| config.vm.provision "docker" do |d| - d.pull_images "therecipe/qt:linux" + d.pull_images "bluszcz/cutego:linux" end end config.vm.define "android" do |m| config.vm.provision "docker" do |d| - d.pull_images "therecipe/qt:android" + d.pull_images "bluszcz/cutego:android" end end config.vm.define "windows_32_shared" do |m| config.vm.provision "docker" do |d| - d.pull_images "therecipe/qt:windows_32_shared" + d.pull_images "bluszcz/cutego:windows_32_shared" end end config.vm.define "windows_32_static" do |m| config.vm.provision "docker" do |d| - d.pull_images "therecipe/qt:windows_32_static" + d.pull_images "bluszcz/cutego:windows_32_static" end end config.vm.define "windows_64_shared" do |m| config.vm.provision "docker" do |d| - d.pull_images "therecipe/qt:windows_64_shared" + d.pull_images "bluszcz/cutego:windows_64_shared" end end config.vm.define "windows_64_static" do |m| config.vm.provision "docker" do |d| - d.pull_images "therecipe/qt:windows_64_static" + d.pull_images "bluszcz/cutego:windows_64_static" end end config.vm.define "rpi1" do |m| config.vm.provision "docker" do |d| - d.pull_images "therecipe/qt:rpi1" + d.pull_images "bluszcz/cutego:rpi1" end end config.vm.define "rpi2" do |m| config.vm.provision "docker" do |d| - d.pull_images "therecipe/qt:rpi2" + d.pull_images "bluszcz/cutego:rpi2" end end config.vm.define "rpi3" do |m| config.vm.provision "docker" do |d| - d.pull_images "therecipe/qt:rpi3" + d.pull_images "bluszcz/cutego:rpi3" end end config.vm.define "sailfish" do |m| config.vm.provision "docker" do |d| - d.pull_images "therecipe/qt:sailfish" + d.pull_images "bluszcz/cutego:sailfish" end end config.vm.define "ubports_arm_vivid" do |m| config.vm.provision "docker" do |d| - d.pull_images "therecipe/qt:ubports_arm_vivid" + d.pull_images "bluszcz/cutego:ubports_arm_vivid" end end config.vm.define "ubports_64_vivid" do |m| config.vm.provision "docker" do |d| - d.pull_images "therecipe/qt:ubports_64_vivid" + d.pull_images "bluszcz/cutego:ubports_64_vivid" end end config.vm.define "ubports_arm_xenial" do |m| config.vm.provision "docker" do |d| - d.pull_images "therecipe/qt:ubports_arm_xenial" + d.pull_images "bluszcz/cutego:ubports_arm_xenial" end end config.vm.define "ubports_64_xenial" do |m| config.vm.provision "docker" do |d| - d.pull_images "therecipe/qt:ubports_64_xenial" + d.pull_images "bluszcz/cutego:ubports_64_xenial" end end diff --git a/interop/gow/gow.go b/interop/gow/gow.go index 61494a5c5..6f27deef8 100644 --- a/interop/gow/gow.go +++ b/interop/gow/gow.go @@ -1,6 +1,6 @@ package gow -import "github.com/therecipe/qt/internal" +import "github.com/bluszcz/cutego/internal" var ( InitProcess = internal.InitProcess From cabb3eedcbefa45803b88fadc57f46dbc51620f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Zawadzki?= Date: Thu, 2 Feb 2023 11:46:21 +0100 Subject: [PATCH 9/9] Missing utils --- internal/binding/templater/enum_go.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/binding/templater/enum_go.go b/internal/binding/templater/enum_go.go index 2a368a084..3794a62f8 100644 --- a/internal/binding/templater/enum_go.go +++ b/internal/binding/templater/enum_go.go @@ -7,6 +7,8 @@ import ( "github.com/bluszcz/cutego/internal/binding/converter" "github.com/bluszcz/cutego/internal/binding/parser" + "github.com/bluszcz/cutego/internal/utils" + ) func goEnum(e *parser.Enum, _ *parser.Value) string {