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] 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 0c89172b..e9594a98 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 de34ad93..25ad194b 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 ccd7a6cb..feb2bedf 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 1352c839..8db2b0fc 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 dc06a954..534e6847 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 73437f5a..e3b719de 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 a0aac420..36604f69 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 2e5e789b..cc8320c5 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 38a83dd3..ecd793bb 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 d5cc326c..b5a83f95 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 857b21ac..9844c5b8 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 f7a4c6c7..82a12015 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 761dd5e5..2b7fbfcd 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 68558e57..eda88ced 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 b3469028..d3e69016 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 929f48fd..0d67e8f1 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 bafb37f6..6f95b4f2 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 0431dc4d..36458c63 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 9b112da0..d17802f9 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 b6752bbc..69ed6c87 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 557e63ad..f62ae054 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 a3d4657e..e80c02bd 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 2cd0541b..7332c66e 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 7297886a..cb655c88 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 1dcbaa0a..b1055f1d 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 44fe4e2a..20f80d4d 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 d1114ee3..9ef2a4b9 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 127f0523..5ee027e7 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 673e2a1a..31456a3e 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 5a221c0b..6bb1d8eb 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 a4926c8f..4344a3f8 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 9d162f05..d0a12a87 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 2eadd375..dea88491 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 cc494a6a..6fdcc43c 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 8f6b1f5a..cdd92f95 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 12635e9f..a306f896 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 97436167..75a07514 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 30058b44..a3708471 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 7ded0605..b77353c5 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 49b86352..9655316d 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 1e96bad0..a7c18b5e 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 c5fa9d2d..8d2fcba6 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 70a774f4..4360bd3f 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 240f98d4..eee847ef 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 6195f424..c0d2a981 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 3ffd1396..cd804d38 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 f4459737..307ce4b5 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 61494a5c..6f27deef 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