From 0167e2b766145ba989798688f125c76f338244ee Mon Sep 17 00:00:00 2001 From: therecipe Date: Sat, 1 Jun 2019 23:45:14 +0200 Subject: [PATCH] fix setup issues on linux + detect go version at runtime + let examples use NewQVariant1 + add pkg-config to docker images --- internal/binding/parser/helper.go | 6 +++++- internal/cmd/cmd.go | 2 +- internal/cmd/deploy/assets.go | 2 +- internal/cmd/deploy/build.go | 4 ++-- internal/cmd/deploy/build_test.go | 2 +- internal/cmd/setup/check.go | 2 +- internal/cmd/setup/install.go | 4 ++-- internal/cmd/setup/test.go | 2 +- internal/docker/android/Dockerfile | 2 +- internal/docker/darwin/Dockerfile | 4 ++-- internal/docker/js/Dockerfile.js | 2 +- internal/docker/js/Dockerfile.js_thread | 2 +- internal/docker/js/Dockerfile.wasm | 2 +- internal/docker/js/Dockerfile.wasm_thread | 2 +- internal/docker/linux/Dockerfile | 2 +- internal/docker/linux/Dockerfile.56 | 2 +- internal/docker/linux/Dockerfile.59 | 2 +- internal/docker/linux/Dockerfile.arch | 2 +- internal/docker/linux/Dockerfile.static | 2 +- internal/docker/linux/Dockerfile.static_base | 2 +- internal/docker/linux/Dockerfile.suse_leap | 2 +- .../docker/linux/Dockerfile.suse_tumbleweed | 2 +- internal/docker/linux/Dockerfile.ubuntu_16_04 | 2 +- internal/docker/linux/Dockerfile.ubuntu_18_04 | 2 +- internal/docker/rpi/Dockerfile.rpi1 | 2 +- internal/docker/rpi/Dockerfile.rpi2 | 2 +- internal/docker/rpi/Dockerfile.rpi3 | 2 +- internal/docker/ubports/Dockerfile.64_vivid | 2 +- internal/docker/ubports/Dockerfile.64_xenial | 2 +- internal/docker/ubports/Dockerfile.arm_vivid | 2 +- internal/docker/ubports/Dockerfile.arm_xenial | 2 +- internal/docker/windows_32_shared/Dockerfile | 2 +- .../docker/windows_32_shared/Dockerfile.base | 2 +- internal/docker/windows_32_static/Dockerfile | 2 +- .../docker/windows_32_static/Dockerfile.base | 2 +- internal/docker/windows_64_shared/Dockerfile | 2 +- .../docker/windows_64_shared/Dockerfile.base | 2 +- internal/docker/windows_64_static/Dockerfile | 2 +- .../docker/windows_64_static/Dockerfile.base | 2 +- .../docker/windows_legacy/Dockerfile.32_shared | 2 +- .../docker/windows_legacy/Dockerfile.32_static | 2 +- .../docker/windows_legacy/Dockerfile.64_shared | 2 +- .../docker/windows_legacy/Dockerfile.64_static | 2 +- .../printslides/cmd/printslides/slideview.go | 2 +- .../examples/bluetooth/picturetransfer/main.go | 2 +- internal/examples/charts/dynamicspline/chart.go | 4 ++-- .../examples/common/qml_demo/inputWidgets.go | 2 +- internal/examples/common/qml_demo/itemViews.go | 2 +- .../common/widgets_demo/inputWidgets.go | 2 +- .../examples/common/widgets_demo/itemViews.go | 4 ++-- .../examples/grpc/hello_world/hello_world.go | 4 ++-- internal/examples/qml/custom_scheme/reply.go | 6 +++--- internal/examples/qml/gallery/gallery.go | 4 ++-- internal/examples/qml/prop/prop.go | 4 ++-- internal/examples/quick/bridge/bridge.go | 2 +- internal/examples/quick/dynamic/dynamic.go | 2 +- internal/examples/quick/listview/personmodel.go | 8 ++++---- .../examples/sailfish/listview/personmodel.go | 8 ++++---- .../sailfish/listview_variant/personmodel.go | 4 ++-- .../showcases/wallet/files/model/files.go | 16 ++++++++-------- .../showcases/wallet/wallet/model/wallet.go | 12 ++++++------ internal/examples/sql/masterdetail/dialog.go | 16 ++++++++-------- .../examples/sql/masterdetail/mainWindow.go | 2 +- .../sql/masterdetail_qml/model/listmodel.go | 2 +- .../sql/masterdetail_qml/model/viewmodel.go | 16 ++++++++-------- .../examples/sql/querymodel/customsqlmodel.go | 4 ++-- .../examples/sql/querymodel/editablesqlmodel.go | 14 +++++++------- internal/examples/sql/querymodel/main.go | 6 +++--- .../webchannel/shared/websockettransport.go | 2 +- internal/examples/webkit/browser/main.go | 2 +- internal/examples/widgets/table/table.go | 14 +++++++------- internal/utils/env.go | 17 ++++++++++++++++- 72 files changed, 149 insertions(+), 130 deletions(-) diff --git a/internal/binding/parser/helper.go b/internal/binding/parser/helper.go index ef149bdb..21922951 100644 --- a/internal/binding/parser/helper.go +++ b/internal/binding/parser/helper.go @@ -249,7 +249,11 @@ func shouldBuildForTarget(module, target string, min bool) bool { for _, m := range cmd.GetQtStdImports() { if strings.ToLower(module) == strings.ToLower(m) || (strings.ToLower(module) == "svg" && (target == "js" || target == "wasm" || strings.HasPrefix(target, "ios") || utils.QT_STATIC())) { - return true + if State.Minimal { + return true + } else { + return shouldBuildForTarget(module, target, false) + } } } return false diff --git a/internal/cmd/cmd.go b/internal/cmd/cmd.go index 175eb22f..32adb1d7 100644 --- a/internal/cmd/cmd.go +++ b/internal/cmd/cmd.go @@ -848,7 +848,7 @@ func BuildEnv(target, name, depPath string) (map[string]string, []string, []stri env["PATH"] = env["PATH"] + ":" + env["EMSDK"] + ":" + env["LLVM_ROOT"] + ":" + env["NODE_JS"] + ":" + env["EMSCRIPTEN"] } - if runtime.GOOS != target || strings.Contains(runtime.Version(), "1.10") { + if runtime.GOOS != target || strings.Contains(utils.GOVERSION(), "1.10") { env["CGO_CFLAGS_ALLOW"] = utils.CGO_CFLAGS_ALLOW() env["CGO_CXXFLAGS_ALLOW"] = utils.CGO_CXXFLAGS_ALLOW() env["CGO_LDFLAGS_ALLOW"] = utils.CGO_LDFLAGS_ALLOW() diff --git a/internal/cmd/deploy/assets.go b/internal/cmd/deploy/assets.go index 533611e3..8d0dd0f3 100644 --- a/internal/cmd/deploy/assets.go +++ b/internal/cmd/deploy/assets.go @@ -689,7 +689,7 @@ export CXX=%v go tool link -f -o $PWD/relinked -importcfg $PWD/b001/importcfg.link -buildmode=%v -w -extld=%v $PWD/b001/_pkg_.a`, - runtime.Version(), + utils.GOVERSION(), runtime.GOOS, runtime.GOARCH, utils.QT_VERSION(), diff --git a/internal/cmd/deploy/build.go b/internal/cmd/deploy/build.go index 763711bc..82e841f2 100644 --- a/internal/cmd/deploy/build.go +++ b/internal/cmd/deploy/build.go @@ -54,7 +54,7 @@ func build(mode, target, path, ldFlagsCustom, tagsCustom, name, depPath string, } var pattern string - if strings.Contains(runtime.Version(), "1.1") || strings.Contains(runtime.Version(), "devel") { + if v := utils.GOVERSION(); strings.Contains(v, "1.1") || strings.Contains(v, "devel") { pattern = "all=" } @@ -186,7 +186,7 @@ func build_sailfish(target, path, ldFlagsCustom, name string) { sailfish_ssh("2222", "root", "ln", "-s", fmt.Sprintf("/srv/mer/toolings/SailfishOS-"+utils.QT_SAILFISH_VERSION()+"/opt/cross/bin/%v-meego-linux-%v-ld", arch, gcc), fmt.Sprintf("/srv/mer/toolings/SailfishOS-"+utils.QT_SAILFISH_VERSION()+"/opt/cross/libexec/gcc/%v-meego-linux-%v/4.8.3/ld", arch, gcc)) var pattern string - if strings.Contains(runtime.Version(), "1.1") || strings.Contains(runtime.Version(), "devel") { + if v := utils.GOVERSION(); strings.Contains(v, "1.1") || strings.Contains(v, "devel") { pattern = "all=" } diff --git a/internal/cmd/deploy/build_test.go b/internal/cmd/deploy/build_test.go index 017765c1..40929b35 100644 --- a/internal/cmd/deploy/build_test.go +++ b/internal/cmd/deploy/build_test.go @@ -20,7 +20,7 @@ func Test_escapeFlags(t *testing.T) { } var pattern string - if strings.Contains(runtime.Version(), "1.1") || strings.Contains(runtime.Version(), "devel") { + if v := utils.GOVERSION(); strings.Contains(v, "1.1") || strings.Contains(v, "devel") { pattern = "all=" } diff --git a/internal/cmd/setup/check.go b/internal/cmd/setup/check.go index edf46b16..22ae9891 100644 --- a/internal/cmd/setup/check.go +++ b/internal/cmd/setup/check.go @@ -36,7 +36,7 @@ func Check(target string, docker, vagrant bool) { vars := [][]string{ {"GOOS", runtime.GOOS}, {"GOARCH", utils.GOARCH()}, - {"GOVERSION", strings.Split(utils.RunCmd(exec.Command("go", "version"), "get go version"), " ")[2]}, + {"GOVERSION", utils.GOVERSION()}, {"GOROOT", runtime.GOROOT()}, {"GOPATH", utils.MustGoPath()}, {"GOBIN", utils.GOBIN()}, diff --git a/internal/cmd/setup/install.go b/internal/cmd/setup/install.go index a9ecc22e..08488fbb 100644 --- a/internal/cmd/setup/install.go +++ b/internal/cmd/setup/install.go @@ -98,7 +98,7 @@ func Install(target string, docker, vagrant, failfast bool) { env["CGO_ENABLED"] = "0" } - cmd := exec.Command("go", "install", "-i", "-p", strconv.Itoa(runtime.GOMAXPROCS(0)), "-v") + cmd := exec.Command("go", "install", "-p", strconv.Itoa(runtime.GOMAXPROCS(0)), "-v") if len(tags) > 0 { cmd.Args = append(cmd.Args, fmt.Sprintf("-tags=\"%v\"", strings.Join(tags, "\" \""))) } @@ -115,7 +115,7 @@ func Install(target string, docker, vagrant, failfast bool) { if target == "js" { cmd.Args = append(cmd.Args, "-v") } else { - if target == "linux" && (utils.QT_PKG_CONFIG() || utils.QT_STATIC()) { + if target == "linux" { env["CGO_LDFLAGS"] = strings.Replace(env["CGO_LDFLAGS"], "-Wl,-rpath,$ORIGIN/lib -Wl,--disable-new-dtags", "", -1) } for key, value := range env { diff --git a/internal/cmd/setup/test.go b/internal/cmd/setup/test.go index 73ac93b1..6df2b680 100644 --- a/internal/cmd/setup/test.go +++ b/internal/cmd/setup/test.go @@ -31,7 +31,7 @@ func Test(target string, docker, vagrant bool, vagrantsystem string) { minimal.Minimal(path, target, "") var pattern string - if strings.Contains(runtime.Version(), "1.1") || strings.Contains(runtime.Version(), "devel") { + if v := utils.GOVERSION(); strings.Contains(v, "1.1") || strings.Contains(v, "devel") { pattern = "all=" } diff --git a/internal/docker/android/Dockerfile b/internal/docker/android/Dockerfile index f04def80..407eaab3 100644 --- a/internal/docker/android/Dockerfile +++ b/internal/docker/android/Dockerfile @@ -89,4 +89,4 @@ 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 || true && rm -rf ./deploy -RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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 e484154d..638d61c6 100644 --- a/internal/docker/darwin/Dockerfile +++ b/internal/docker/darwin/Dockerfile @@ -14,7 +14,7 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install automak RUN git clone -q --depth 1 https://github.com/mackyle/xar.git && cd /xar/xar && ./autogen.sh --prefix=/osxcross/target && make -j $(grep -c ^processor /proc/cpuinfo) && make install -j $(grep -c ^processor /proc/cpuinfo) && ./autogen.sh --prefix=/usr && make -j $(grep -c ^processor /proc/cpuinfo) && make install -j $(grep -c ^processor /proc/cpuinfo) ENV LD_LIBRARY_PATH=/osxcross/target/lib -RUN git clone -q --depth 1 -b 2.0.0 https://github.com/tpoechtrager/apple-libtapi.git && cd /apple-libtapi && INSTALLPREFIX=/osxcross/target ./build.sh && ./install.sh +RUN git clone -q --depth 1 -b 1000.10.8 https://github.com/tpoechtrager/apple-libtapi.git && cd /apple-libtapi && INSTALLPREFIX=/osxcross/target ./build.sh && ./install.sh RUN git clone -q --depth 1 https://github.com/tpoechtrager/cctools-port.git && cd /cctools-port/cctools && ./configure --prefix=/osxcross/target --target=x86_64-apple-darwin18 --with-libtapi=/osxcross/target && make -j $(grep -c ^processor /proc/cpuinfo) && make install -j $(grep -c ^processor /proc/cpuinfo) @@ -76,4 +76,4 @@ 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 apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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 b/internal/docker/js/Dockerfile.js index 14c9b364..fc17faba 100644 --- a/internal/docker/js/Dockerfile.js +++ b/internal/docker/js/Dockerfile.js @@ -28,4 +28,4 @@ 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 apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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 30db6fb1..fc84d401 100644 --- a/internal/docker/js/Dockerfile.js_thread +++ b/internal/docker/js/Dockerfile.js_thread @@ -28,4 +28,4 @@ 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 apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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 5c2680d4..a290082d 100644 --- a/internal/docker/js/Dockerfile.wasm +++ b/internal/docker/js/Dockerfile.wasm @@ -26,4 +26,4 @@ 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 apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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 f67246cc..16f36ec3 100644 --- a/internal/docker/js/Dockerfile.wasm_thread +++ b/internal/docker/js/Dockerfile.wasm_thread @@ -26,4 +26,4 @@ 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 apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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 4fb10f10..cdcdf17a 100644 --- a/internal/docker/linux/Dockerfile +++ b/internal/docker/linux/Dockerfile @@ -41,4 +41,4 @@ 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 apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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 bff85b11..872672a8 100644 --- a/internal/docker/linux/Dockerfile.56 +++ b/internal/docker/linux/Dockerfile.56 @@ -42,4 +42,4 @@ 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 apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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 17e3104b..1c323622 100644 --- a/internal/docker/linux/Dockerfile.59 +++ b/internal/docker/linux/Dockerfile.59 @@ -39,4 +39,4 @@ 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 apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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 6e20917b..ede6df41 100644 --- a/internal/docker/linux/Dockerfile.arch +++ b/internal/docker/linux/Dockerfile.arch @@ -33,4 +33,4 @@ 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 pacman -S --noconfirm --needed --noprogressbar --quiet ca-certificates git \ No newline at end of file +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.static b/internal/docker/linux/Dockerfile.static index d364bb90..d3e156a6 100644 --- a/internal/docker/linux/Dockerfile.static +++ b/internal/docker/linux/Dockerfile.static @@ -53,4 +53,4 @@ 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 apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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.static_base b/internal/docker/linux/Dockerfile.static_base index cbf47b46..92808e15 100644 --- a/internal/docker/linux/Dockerfile.static_base +++ b/internal/docker/linux/Dockerfile.static_base @@ -1,6 +1,6 @@ FROM ubuntu:16.04 as base -RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git +RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config 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 --no-install-recommends -qq -y install fontconfig libasound2 libegl1-mesa libnss3 libpci3 libxcomposite1 libxcursor1 libxi6 libxrandr2 libxtst6 diff --git a/internal/docker/linux/Dockerfile.suse_leap b/internal/docker/linux/Dockerfile.suse_leap index fe75cca3..01eb066e 100644 --- a/internal/docker/linux/Dockerfile.suse_leap +++ b/internal/docker/linux/Dockerfile.suse_leap @@ -26,4 +26,4 @@ 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 zypper -q ref && zypper -n -q install --no-recommends git \ No newline at end of file +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 273c04cb..d578717d 100644 --- a/internal/docker/linux/Dockerfile.suse_tumbleweed +++ b/internal/docker/linux/Dockerfile.suse_tumbleweed @@ -27,4 +27,4 @@ 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 zypper -q ref && zypper -n -q install --no-recommends git \ No newline at end of file +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.ubuntu_16_04 b/internal/docker/linux/Dockerfile.ubuntu_16_04 index 9fc8518e..c6072f12 100644 --- a/internal/docker/linux/Dockerfile.ubuntu_16_04 +++ b/internal/docker/linux/Dockerfile.ubuntu_16_04 @@ -30,4 +30,4 @@ 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 apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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 b/internal/docker/linux/Dockerfile.ubuntu_18_04 index d213d796..4ca1d31b 100644 --- a/internal/docker/linux/Dockerfile.ubuntu_18_04 +++ b/internal/docker/linux/Dockerfile.ubuntu_18_04 @@ -30,4 +30,4 @@ 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 apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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.rpi1 b/internal/docker/rpi/Dockerfile.rpi1 index 3749fa1e..0f846de1 100644 --- a/internal/docker/rpi/Dockerfile.rpi1 +++ b/internal/docker/rpi/Dockerfile.rpi1 @@ -15,4 +15,4 @@ 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 && $GOPATH/bin/qtdeploy build rpi1 && rm -rf ./deploy -RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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 16788df0..7e03cf57 100644 --- a/internal/docker/rpi/Dockerfile.rpi2 +++ b/internal/docker/rpi/Dockerfile.rpi2 @@ -15,4 +15,4 @@ 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 && $GOPATH/bin/qtdeploy build rpi2 && rm -rf ./deploy -RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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 9cc740e5..a8456044 100644 --- a/internal/docker/rpi/Dockerfile.rpi3 +++ b/internal/docker/rpi/Dockerfile.rpi3 @@ -15,4 +15,4 @@ 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 && $GOPATH/bin/qtdeploy build rpi3 && rm -rf ./deploy -RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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_vivid b/internal/docker/ubports/Dockerfile.64_vivid index 02bc675a..d882f475 100644 --- a/internal/docker/ubports/Dockerfile.64_vivid +++ b/internal/docker/ubports/Dockerfile.64_vivid @@ -23,4 +23,4 @@ RUN $GOPATH/bin/qtsetup check ubports RUN $GOPATH/bin/qtsetup generate ubports RUN $GOPATH/bin/qtsetup install ubports -RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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 0d917555..986eb742 100644 --- a/internal/docker/ubports/Dockerfile.64_xenial +++ b/internal/docker/ubports/Dockerfile.64_xenial @@ -21,4 +21,4 @@ RUN $GOPATH/bin/qtsetup check ubports RUN $GOPATH/bin/qtsetup generate ubports RUN $GOPATH/bin/qtsetup install ubports -RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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 7bb8901e..690ae0ff 100644 --- a/internal/docker/ubports/Dockerfile.arm_vivid +++ b/internal/docker/ubports/Dockerfile.arm_vivid @@ -26,4 +26,4 @@ RUN $GOPATH/bin/qtsetup check ubports RUN $GOPATH/bin/qtsetup generate ubports || true RUN $GOPATH/bin/qtsetup install ubports -RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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 7a95818e..f0a66968 100644 --- a/internal/docker/ubports/Dockerfile.arm_xenial +++ b/internal/docker/ubports/Dockerfile.arm_xenial @@ -23,4 +23,4 @@ RUN $GOPATH/bin/qtsetup check ubports RUN $GOPATH/bin/qtsetup generate ubports RUN $GOPATH/bin/qtsetup install ubports -RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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 6cd083b8..5f667cf5 100644 --- a/internal/docker/windows_32_shared/Dockerfile +++ b/internal/docker/windows_32_shared/Dockerfile @@ -21,4 +21,4 @@ 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 apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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.base b/internal/docker/windows_32_shared/Dockerfile.base index a6abd185..68ae242f 100644 --- a/internal/docker/windows_32_shared/Dockerfile.base +++ b/internal/docker/windows_32_shared/Dockerfile.base @@ -1,6 +1,6 @@ FROM ubuntu:16.04 as base -RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git +RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config RUN git clone -q --depth 1 https://github.com/mxe/mxe.git /usr/lib/mxe RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install autoconf automake autopoint bash bison bzip2 flex g++ g++-multilib gettext git gperf intltool libc6-dev-i386 libgdk-pixbuf2.0-dev libltdl-dev libssl-dev libtool-bin libxml-parser-perl make openssl p7zip-full patch perl pkg-config python ruby scons sed unzip wget xz-utils lzip diff --git a/internal/docker/windows_32_static/Dockerfile b/internal/docker/windows_32_static/Dockerfile index 1f65e5cf..6a91066c 100644 --- a/internal/docker/windows_32_static/Dockerfile +++ b/internal/docker/windows_32_static/Dockerfile @@ -21,4 +21,4 @@ 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 apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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.base b/internal/docker/windows_32_static/Dockerfile.base index ab9581b8..3198febd 100644 --- a/internal/docker/windows_32_static/Dockerfile.base +++ b/internal/docker/windows_32_static/Dockerfile.base @@ -1,6 +1,6 @@ FROM ubuntu:16.04 as base -RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git +RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config RUN git clone -q --depth 1 https://github.com/mxe/mxe.git /usr/lib/mxe RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install autoconf automake autopoint bash bison bzip2 flex g++ g++-multilib gettext git gperf intltool libc6-dev-i386 libgdk-pixbuf2.0-dev libltdl-dev libssl-dev libtool-bin libxml-parser-perl make openssl p7zip-full patch perl pkg-config python ruby scons sed unzip wget xz-utils lzip diff --git a/internal/docker/windows_64_shared/Dockerfile b/internal/docker/windows_64_shared/Dockerfile index 48835fd7..7ae80aa4 100644 --- a/internal/docker/windows_64_shared/Dockerfile +++ b/internal/docker/windows_64_shared/Dockerfile @@ -21,4 +21,4 @@ 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 apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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.base b/internal/docker/windows_64_shared/Dockerfile.base index 61744200..9c289999 100644 --- a/internal/docker/windows_64_shared/Dockerfile.base +++ b/internal/docker/windows_64_shared/Dockerfile.base @@ -1,6 +1,6 @@ FROM ubuntu:16.04 as base -RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git +RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config RUN git clone -q --depth 1 https://github.com/mxe/mxe.git /usr/lib/mxe RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install autoconf automake autopoint bash bison bzip2 flex g++ g++-multilib gettext git gperf intltool libc6-dev-i386 libgdk-pixbuf2.0-dev libltdl-dev libssl-dev libtool-bin libxml-parser-perl make openssl p7zip-full patch perl pkg-config python ruby scons sed unzip wget xz-utils lzip diff --git a/internal/docker/windows_64_static/Dockerfile b/internal/docker/windows_64_static/Dockerfile index bee40b5e..f7d20c40 100644 --- a/internal/docker/windows_64_static/Dockerfile +++ b/internal/docker/windows_64_static/Dockerfile @@ -21,4 +21,4 @@ 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 apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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.base b/internal/docker/windows_64_static/Dockerfile.base index 144649f7..c21f9de9 100644 --- a/internal/docker/windows_64_static/Dockerfile.base +++ b/internal/docker/windows_64_static/Dockerfile.base @@ -1,6 +1,6 @@ FROM ubuntu:16.04 as base -RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git +RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git pkg-config RUN git clone -q --depth 1 https://github.com/mxe/mxe.git /usr/lib/mxe RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install autoconf automake autopoint bash bison bzip2 flex g++ g++-multilib gettext git gperf intltool libc6-dev-i386 libgdk-pixbuf2.0-dev libltdl-dev libssl-dev libtool-bin libxml-parser-perl make openssl p7zip-full patch perl pkg-config python ruby scons sed unzip wget xz-utils lzip diff --git a/internal/docker/windows_legacy/Dockerfile.32_shared b/internal/docker/windows_legacy/Dockerfile.32_shared index 44d5868d..5de23140 100644 --- a/internal/docker/windows_legacy/Dockerfile.32_shared +++ b/internal/docker/windows_legacy/Dockerfile.32_shared @@ -27,4 +27,4 @@ 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 apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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 8aec97d6..66dc97a9 100644 --- a/internal/docker/windows_legacy/Dockerfile.32_static +++ b/internal/docker/windows_legacy/Dockerfile.32_static @@ -27,4 +27,4 @@ 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 apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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 2538afb8..9fafd99d 100644 --- a/internal/docker/windows_legacy/Dockerfile.64_shared +++ b/internal/docker/windows_legacy/Dockerfile.64_shared @@ -27,4 +27,4 @@ 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 apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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 e2d40fc9..dfbda004 100644 --- a/internal/docker/windows_legacy/Dockerfile.64_static +++ b/internal/docker/windows_legacy/Dockerfile.64_static @@ -27,4 +27,4 @@ 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 apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git \ No newline at end of file +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/examples/3rdparty/printslides/cmd/printslides/slideview.go b/internal/examples/3rdparty/printslides/cmd/printslides/slideview.go index 3a00398d..7e687773 100644 --- a/internal/examples/3rdparty/printslides/cmd/printslides/slideview.go +++ b/internal/examples/3rdparty/printslides/cmd/printslides/slideview.go @@ -55,7 +55,7 @@ func (v *SlideView) updateStatus(status quick.QQuickView__Status) { println("Found qml Presentation as rootObject") } - ri.SetProperty("allowDelay", core.NewQVariant11(false)) //Disable partial reveals on slide pages + ri.SetProperty("allowDelay", core.NewQVariant1(false)) //Disable partial reveals on slide pages slides := ri.Property("slides").ToList() v.m_slidesLeft = len(slides) diff --git a/internal/examples/bluetooth/picturetransfer/main.go b/internal/examples/bluetooth/picturetransfer/main.go index 5d3daf54..87b8a8b9 100644 --- a/internal/examples/bluetooth/picturetransfer/main.go +++ b/internal/examples/bluetooth/picturetransfer/main.go @@ -20,7 +20,7 @@ func main() { view := quick.NewQQuickView(nil) view.RootContext().SetContextProperty("fileTransfer", fileTransfer) - view.RootContext().SetContextProperty2("SystemPictureFolder", core.NewQVariant14(core.QStandardPaths_StandardLocations(core.QStandardPaths__PicturesLocation)[0])) + view.RootContext().SetContextProperty2("SystemPictureFolder", core.NewQVariant1(core.QStandardPaths_StandardLocations(core.QStandardPaths__PicturesLocation)[0])) fmt.Println(core.QStandardPaths_StandardLocations(core.QStandardPaths__PicturesLocation)) diff --git a/internal/examples/charts/dynamicspline/chart.go b/internal/examples/charts/dynamicspline/chart.go index d3d0969d..1587b6c1 100644 --- a/internal/examples/charts/dynamicspline/chart.go +++ b/internal/examples/charts/dynamicspline/chart.go @@ -40,8 +40,8 @@ func (c *Chart) init() { c.AddSeries(c.m_series) c.CreateDefaultAxes() c.SetAxisX(c.m_axis, c.m_series) - c.AxisX(nil).SetRange(core.NewQVariant12(0), core.NewQVariant12(10)) - c.AxisY(nil).SetRange(core.NewQVariant12(-5), core.NewQVariant12(10)) + c.AxisX(nil).SetRange(core.NewQVariant1(0), core.NewQVariant1(10)) + c.AxisY(nil).SetRange(core.NewQVariant1(-5), core.NewQVariant1(10)) c.m_timer.Start2() } diff --git a/internal/examples/common/qml_demo/inputWidgets.go b/internal/examples/common/qml_demo/inputWidgets.go index 244b5ec5..0aaef63f 100644 --- a/internal/examples/common/qml_demo/inputWidgets.go +++ b/internal/examples/common/qml_demo/inputWidgets.go @@ -16,7 +16,7 @@ func inputWidgets() { if role != int(core.Qt__DisplayRole) { return core.NewQVariant() } - return core.NewQVariant14(listDB[index.Row()]) + return core.NewQVariant1(listDB[index.Row()]) }) //Combo Box diff --git a/internal/examples/common/qml_demo/itemViews.go b/internal/examples/common/qml_demo/itemViews.go index 1ece4bd0..8435193f 100644 --- a/internal/examples/common/qml_demo/itemViews.go +++ b/internal/examples/common/qml_demo/itemViews.go @@ -26,7 +26,7 @@ func itemViews() { if _, ok := listRoles[role]; !ok { return core.NewQVariant() } - return core.NewQVariant14(listDB[index.Row()][listRoles[role].ConstData()]) + return core.NewQVariant1(listDB[index.Row()][listRoles[role].ConstData()]) }) listModel.ConnectRoleNames(func() map[int]*core.QByteArray { return listRoles diff --git a/internal/examples/common/widgets_demo/inputWidgets.go b/internal/examples/common/widgets_demo/inputWidgets.go index 7d8e7ac8..8412eb46 100644 --- a/internal/examples/common/widgets_demo/inputWidgets.go +++ b/internal/examples/common/widgets_demo/inputWidgets.go @@ -32,7 +32,7 @@ func inputWidgets() { if role != int(core.Qt__DisplayRole) { return core.NewQVariant() } - return core.NewQVariant14(items[index.Row()]) + return core.NewQVariant1(items[index.Row()]) }) comboBoxL.SetModel(listModel) diff --git a/internal/examples/common/widgets_demo/itemViews.go b/internal/examples/common/widgets_demo/itemViews.go index 81fc13fe..6c50978e 100644 --- a/internal/examples/common/widgets_demo/itemViews.go +++ b/internal/examples/common/widgets_demo/itemViews.go @@ -22,7 +22,7 @@ func itemViews() { if role != int(core.Qt__DisplayRole) { return core.NewQVariant() } - return core.NewQVariant14(list[index.Row()]) + return core.NewQVariant1(list[index.Row()]) }) listView.SetModel(listModel) addWidget(listView) @@ -83,7 +83,7 @@ func itemViews() { if role != int(core.Qt__DisplayRole) { return core.NewQVariant() } - return core.NewQVariant14(table[index.Row()][index.Column()]) + return core.NewQVariant1(table[index.Row()][index.Column()]) }) tableView.SetModel(tableModel) addWidget(tableView) diff --git a/internal/examples/grpc/hello_world/hello_world.go b/internal/examples/grpc/hello_world/hello_world.go index cd57a42a..ee930e34 100644 --- a/internal/examples/grpc/hello_world/hello_world.go +++ b/internal/examples/grpc/hello_world/hello_world.go @@ -45,9 +45,9 @@ func main() { ret.ConnectSayHello(func(s string) []*core.QVariant { var out, err = client.SayHello(s) if err != nil { - return []*core.QVariant{core.NewQVariant14(out), core.NewQVariant14(err.Error())} + return []*core.QVariant{core.NewQVariant1(out), core.NewQVariant1(err.Error())} } - return []*core.QVariant{core.NewQVariant14(out)} + return []*core.QVariant{core.NewQVariant1(out)} }) ret.ConnectShutdown(func() error { diff --git a/internal/examples/qml/custom_scheme/reply.go b/internal/examples/qml/custom_scheme/reply.go index 7529dc07..6316448f 100644 --- a/internal/examples/qml/custom_scheme/reply.go +++ b/internal/examples/qml/custom_scheme/reply.go @@ -63,8 +63,8 @@ func NewCustomReply(op network.QNetworkAccessManager__Operation, req *network.QN *data = string(content[offset : offset+number]) offset += number - customReply.SetAttribute(network.QNetworkRequest__HttpStatusCodeAttribute, core.NewQVariant7(200)) - customReply.SetAttribute(network.QNetworkRequest__HttpReasonPhraseAttribute, core.NewQVariant14("OK")) + customReply.SetAttribute(network.QNetworkRequest__HttpStatusCodeAttribute, core.NewQVariant1(200)) + customReply.SetAttribute(network.QNetworkRequest__HttpReasonPhraseAttribute, core.NewQVariant1("OK")) return number }) @@ -78,7 +78,7 @@ func NewCustomReply(op network.QNetworkAccessManager__Operation, req *network.QN }) customReply.Open(core.QIODevice__ReadOnly | core.QIODevice__Unbuffered) - customReply.SetHeader(network.QNetworkRequest__ContentLengthHeader, core.NewQVariant9(int64(len(content)))) + customReply.SetHeader(network.QNetworkRequest__ContentLengthHeader, core.NewQVariant1(int64(len(content)))) customReply.MetaDataChanged() customReply.DownloadProgress(int64(len(content)), int64(len(content))) diff --git a/internal/examples/qml/gallery/gallery.go b/internal/examples/qml/gallery/gallery.go index 000c319f..ed2c2c0a 100644 --- a/internal/examples/qml/gallery/gallery.go +++ b/internal/examples/qml/gallery/gallery.go @@ -22,9 +22,9 @@ func main() { style = quickcontrols2.QQuickStyle_Name() ) if style != "" { - settings.SetValue("style", core.NewQVariant14(style)) + settings.SetValue("style", core.NewQVariant1(style)) } else { - quickcontrols2.QQuickStyle_SetStyle(settings.Value("style", core.NewQVariant14("")).ToString()) + quickcontrols2.QQuickStyle_SetStyle(settings.Value("style", core.NewQVariant1("")).ToString()) } var engine = qml.NewQQmlApplicationEngine(nil) diff --git a/internal/examples/qml/prop/prop.go b/internal/examples/qml/prop/prop.go index 9311d3b0..527204e4 100644 --- a/internal/examples/qml/prop/prop.go +++ b/internal/examples/qml/prop/prop.go @@ -19,8 +19,8 @@ func main() { var someBool bool fmt.Println("Property value:", object.Property("someNumber").ToInt(&someBool), someBool) - object.SetProperty("someNumber", core.NewQVariant7(5000)) + object.SetProperty("someNumber", core.NewQVariant1(5000)) fmt.Println("Property value:", object.Property("someNumber").ToInt(&someBool), someBool) - object.SetProperty("someNumber", core.NewQVariant7(200)) + object.SetProperty("someNumber", core.NewQVariant1(200)) fmt.Println("Property value:", object.Property("someNumber").ToInt(&someBool), someBool) } diff --git a/internal/examples/quick/bridge/bridge.go b/internal/examples/quick/bridge/bridge.go index f72f9b54..f83b2e09 100644 --- a/internal/examples/quick/bridge/bridge.go +++ b/internal/examples/quick/bridge/bridge.go @@ -95,7 +95,7 @@ func initQmlContext(quickWidget *quick.QQuickWidget) { if err != nil { log.Println("initQmlContext", err) } - quickWidget.RootContext().SetContextProperty2("qmlInitContext", core.NewQVariant14(string(b))) + quickWidget.RootContext().SetContextProperty2("qmlInitContext", core.NewQVariant1(string(b))) } type QmlBridge struct { diff --git a/internal/examples/quick/dynamic/dynamic.go b/internal/examples/quick/dynamic/dynamic.go index 3f9a186a..29a14db7 100644 --- a/internal/examples/quick/dynamic/dynamic.go +++ b/internal/examples/quick/dynamic/dynamic.go @@ -52,7 +52,7 @@ Item { } ` - mainComponent.SetData(core.NewQByteArray2(qmlString, len(qmlString)), core.NewQUrl()) + mainComponent.SetData(core.NewQByteArray2(qmlString, -1), core.NewQUrl()) view.Show() widgets.QApplication_Exec() diff --git a/internal/examples/quick/listview/personmodel.go b/internal/examples/quick/listview/personmodel.go index 0ef09ebc..1bcf84ce 100644 --- a/internal/examples/quick/listview/personmodel.go +++ b/internal/examples/quick/listview/personmodel.go @@ -33,8 +33,8 @@ func init() { func (m *PersonModel) init() { m.SetRoles(map[int]*core.QByteArray{ - FirstName: core.NewQByteArray2("firstName", len("firstName")), - LastName: core.NewQByteArray2("lastName", len("lastName")), + FirstName: core.NewQByteArray2("firstName", -1), + LastName: core.NewQByteArray2("lastName", -1), }) m.ConnectData(m.data) @@ -61,12 +61,12 @@ func (m *PersonModel) data(index *core.QModelIndex, role int) *core.QVariant { switch role { case FirstName: { - return core.NewQVariant14(p.FirstName()) + return core.NewQVariant1(p.FirstName()) } case LastName: { - return core.NewQVariant14(p.LastName()) + return core.NewQVariant1(p.LastName()) } default: diff --git a/internal/examples/sailfish/listview/personmodel.go b/internal/examples/sailfish/listview/personmodel.go index 0ef09ebc..1bcf84ce 100644 --- a/internal/examples/sailfish/listview/personmodel.go +++ b/internal/examples/sailfish/listview/personmodel.go @@ -33,8 +33,8 @@ func init() { func (m *PersonModel) init() { m.SetRoles(map[int]*core.QByteArray{ - FirstName: core.NewQByteArray2("firstName", len("firstName")), - LastName: core.NewQByteArray2("lastName", len("lastName")), + FirstName: core.NewQByteArray2("firstName", -1), + LastName: core.NewQByteArray2("lastName", -1), }) m.ConnectData(m.data) @@ -61,12 +61,12 @@ func (m *PersonModel) data(index *core.QModelIndex, role int) *core.QVariant { switch role { case FirstName: { - return core.NewQVariant14(p.FirstName()) + return core.NewQVariant1(p.FirstName()) } case LastName: { - return core.NewQVariant14(p.LastName()) + return core.NewQVariant1(p.LastName()) } default: diff --git a/internal/examples/sailfish/listview_variant/personmodel.go b/internal/examples/sailfish/listview_variant/personmodel.go index b1e4904f..6200b5a5 100644 --- a/internal/examples/sailfish/listview_variant/personmodel.go +++ b/internal/examples/sailfish/listview_variant/personmodel.go @@ -33,8 +33,8 @@ func init() { func (m *PersonModel) init() { m.SetRoles(map[int]*core.QByteArray{ - FirstName: core.NewQByteArray2("firstName", len("firstName")), - LastName: core.NewQByteArray2("lastName", len("lastName")), + FirstName: core.NewQByteArray2("firstName", -1), + LastName: core.NewQByteArray2("lastName", -1), }) m.ConnectData(m.data) diff --git a/internal/examples/showcases/wallet/files/model/files.go b/internal/examples/showcases/wallet/files/model/files.go index 3303219e..65c4aadd 100644 --- a/internal/examples/showcases/wallet/files/model/files.go +++ b/internal/examples/showcases/wallet/files/model/files.go @@ -55,20 +55,20 @@ func (m *FilesModel) data(index *core.QModelIndex, role int) *core.QVariant { switch { case index.Column() == 0 && role == int(core.Qt__DisplayRole) || //needed for sort filter model role == int(core.Qt__UserRole)+1: - return core.NewQVariant14(dbItem.Name) + return core.NewQVariant1(dbItem.Name) case role == int(core.Qt__UserRole)+2: - return core.NewQVariant14(dbItem.Size) + return core.NewQVariant1(dbItem.Size) case role == int(core.Qt__UserRole)+3: - return core.NewQVariant14(dbItem.Redundancy) + return core.NewQVariant1(dbItem.Redundancy) case role == int(core.Qt__UserRole)+4: - return core.NewQVariant25(map[string]*core.QVariant{ - "available": core.NewQVariant11(dbItem.Available), - "text": core.NewQVariant14(dbItem.ProgressText), - "value": core.NewQVariant12(dbItem.ProgressValue), - "error": core.NewQVariant11(dbItem.Error != ""), + return core.NewQVariant1(map[string]*core.QVariant{ + "available": core.NewQVariant1(dbItem.Available), + "text": core.NewQVariant1(dbItem.ProgressText), + "value": core.NewQVariant1(dbItem.ProgressValue), + "error": core.NewQVariant1(dbItem.Error != ""), }) } diff --git a/internal/examples/showcases/wallet/wallet/model/wallet.go b/internal/examples/showcases/wallet/wallet/model/wallet.go index 734cf6f6..1e9f0a38 100644 --- a/internal/examples/showcases/wallet/wallet/model/wallet.go +++ b/internal/examples/showcases/wallet/wallet/model/wallet.go @@ -46,22 +46,22 @@ func (m *WalletModel) data(index *core.QModelIndex, role int) *core.QVariant { switch { case role == int(core.Qt__UserRole)+1: - return core.NewQVariant14(dbItem.Status) + return core.NewQVariant1(dbItem.Status) case role == int(core.Qt__UserRole)+2: - return core.NewQVariant14(dbItem.Date) + return core.NewQVariant1(dbItem.Date) case role == int(core.Qt__UserRole)+3: - return core.NewQVariant14(dbItem.Amount) + return core.NewQVariant1(dbItem.Amount) case role == int(core.Qt__UserRole)+4: - return core.NewQVariant14(dbItem.Type) + return core.NewQVariant1(dbItem.Type) case role == int(core.Qt__UserRole)+5: - return core.NewQVariant14(dbItem.Total) + return core.NewQVariant1(dbItem.Total) case role == int(core.Qt__UserRole)+6: - return core.NewQVariant14(dbItem.ID) + return core.NewQVariant1(dbItem.ID) } return core.NewQVariant() diff --git a/internal/examples/sql/masterdetail/dialog.go b/internal/examples/sql/masterdetail/dialog.go index d8a8aa1e..d69f316f 100644 --- a/internal/examples/sql/masterdetail/dialog.go +++ b/internal/examples/sql/masterdetail/dialog.go @@ -97,9 +97,9 @@ func (d *Dialog) addNewArtist(name string) int { f2 := sql.NewQSqlField("artist", core.QVariant__String) f3 := sql.NewQSqlField("albumcount", core.QVariant__Int) - f1.SetValue(core.NewQVariant7(id)) - f2.SetValue(core.NewQVariant14(name)) - f3.SetValue(core.NewQVariant7(0)) + f1.SetValue(core.NewQVariant1(id)) + f2.SetValue(core.NewQVariant1(name)) + f3.SetValue(core.NewQVariant1(0)) record.Append(f1) record.Append(f2) record.Append(f3) @@ -118,10 +118,10 @@ func (d *Dialog) addNewAlbum(title string, artistId int) int { f3 := sql.NewQSqlField("artistid", core.QVariant__Int) f4 := sql.NewQSqlField("year", core.QVariant__Int) - f1.SetValue(core.NewQVariant7(id)) - f2.SetValue(core.NewQVariant14(title)) - f3.SetValue(core.NewQVariant7(artistId)) - f4.SetValue(core.NewQVariant7(d.yearEditor.Value())) + f1.SetValue(core.NewQVariant1(id)) + f2.SetValue(core.NewQVariant1(title)) + f3.SetValue(core.NewQVariant1(artistId)) + f4.SetValue(core.NewQVariant1(d.yearEditor.Value())) record.Append(f1) record.Append(f2) record.Append(f3) @@ -175,7 +175,7 @@ func (d *Dialog) increaseAlbumCount(artistIndex *core.QModelIndex) { albumCountIndex := artistIndex.Sibling(artistIndex.Row(), 2) albumCount := albumCountIndex.Data(0).ToInt(nil) - artistModel.SetData(albumCountIndex, core.NewQVariant7(albumCount+1), 0) + artistModel.SetData(albumCountIndex, core.NewQVariant1(albumCount+1), 0) } func (d *Dialog) revert() { diff --git a/internal/examples/sql/masterdetail/mainWindow.go b/internal/examples/sql/masterdetail/mainWindow.go index f5413696..f094a1a4 100644 --- a/internal/examples/sql/masterdetail/mainWindow.go +++ b/internal/examples/sql/masterdetail/mainWindow.go @@ -237,7 +237,7 @@ func (w *MainWindow) decreaseAlbumCount(artistIndex *core.QModelIndex) { artists.RemoveRow(row, core.NewQModelIndex()) w.showImageLabel() } else { - artists.SetData(albumCountIndex, core.NewQVariant7(albumCount-1), 0) + artists.SetData(albumCountIndex, core.NewQVariant1(albumCount-1), 0) } } diff --git a/internal/examples/sql/masterdetail_qml/model/listmodel.go b/internal/examples/sql/masterdetail_qml/model/listmodel.go index c2e5032e..0097658e 100644 --- a/internal/examples/sql/masterdetail_qml/model/listmodel.go +++ b/internal/examples/sql/masterdetail_qml/model/listmodel.go @@ -27,5 +27,5 @@ func (m *listModel) data(index *core.QModelIndex, role int) *core.QVariant { if role != int(core.Qt__DisplayRole) { return core.NewQVariant() } - return core.NewQVariant14(getArtistForID(index.Row()).Name) + return core.NewQVariant1(getArtistForID(index.Row()).Name) } diff --git a/internal/examples/sql/masterdetail_qml/model/viewmodel.go b/internal/examples/sql/masterdetail_qml/model/viewmodel.go index ce6e5824..bb551323 100644 --- a/internal/examples/sql/masterdetail_qml/model/viewmodel.go +++ b/internal/examples/sql/masterdetail_qml/model/viewmodel.go @@ -27,16 +27,16 @@ func (m *ViewModel) headerData(section int, orientation core.Qt__Orientation, ro switch section { case 0: - return core.NewQVariant14("ID") + return core.NewQVariant1("ID") case 1: - return core.NewQVariant14("Title") + return core.NewQVariant1("Title") case 2: - return core.NewQVariant14("Artist") + return core.NewQVariant1("Artist") case 3: - return core.NewQVariant14("Year") + return core.NewQVariant1("Year") } return core.NewQVariant() @@ -67,25 +67,25 @@ func (m *ViewModel) data(index *core.QModelIndex, role int) *core.QVariant { index.Column() == 0 && role == int(core.Qt__DisplayRole) || //widgets role == int(core.Qt__UserRole)+1: //qml - return core.NewQVariant7(dbItem.Album.ID) + return core.NewQVariant1(dbItem.Album.ID) case index.Column() == 1 && role == int(core.Qt__DisplayRole) || //widgets role == int(core.Qt__UserRole)+2: //qml - return core.NewQVariant14(dbItem.Album.Title) + return core.NewQVariant1(dbItem.Album.Title) case index.Column() == 2 && role == int(core.Qt__DisplayRole) || //widgets role == int(core.Qt__UserRole)+3: //qml - return core.NewQVariant14(dbItem.Artist.Name) + return core.NewQVariant1(dbItem.Artist.Name) case index.Column() == 3 && role == int(core.Qt__DisplayRole) || //widgets role == int(core.Qt__UserRole)+4: //qml - return core.NewQVariant7(dbItem.Album.Year) + return core.NewQVariant1(dbItem.Album.Year) } return core.NewQVariant() diff --git a/internal/examples/sql/querymodel/customsqlmodel.go b/internal/examples/sql/querymodel/customsqlmodel.go index fdd99bb7..7904848c 100644 --- a/internal/examples/sql/querymodel/customsqlmodel.go +++ b/internal/examples/sql/querymodel/customsqlmodel.go @@ -25,9 +25,9 @@ func (m *CustomSqlModel) data(index *core.QModelIndex, role int) *core.QVariant var value = m.DataDefault(index, role) if value.IsValid() && role == int(core.Qt__DisplayRole) { if index.Column() == 0 { - return core.NewQVariant14("#" + value.ToString()) + return core.NewQVariant1("#" + value.ToString()) } else if index.Column() == 2 { - return core.NewQVariant14(strings.ToUpper(value.ToString())) + return core.NewQVariant1(strings.ToUpper(value.ToString())) } } diff --git a/internal/examples/sql/querymodel/editablesqlmodel.go b/internal/examples/sql/querymodel/editablesqlmodel.go index 545bfdc9..801ef1da 100644 --- a/internal/examples/sql/querymodel/editablesqlmodel.go +++ b/internal/examples/sql/querymodel/editablesqlmodel.go @@ -53,23 +53,23 @@ func (m *EditableSqlModel) setData(index *core.QModelIndex, value *core.QVariant func (m *EditableSqlModel) refresh() { m.SetQuery2("select * from person", db) - m.SetHeaderData(0, core.Qt__Horizontal, core.NewQVariant14("ID"), 0) - m.SetHeaderData(1, core.Qt__Horizontal, core.NewQVariant14("First Name"), 0) - m.SetHeaderData(2, core.Qt__Horizontal, core.NewQVariant14("Last Name"), 0) + m.SetHeaderData(0, core.Qt__Horizontal, core.NewQVariant1("ID"), 0) + m.SetHeaderData(1, core.Qt__Horizontal, core.NewQVariant1("First Name"), 0) + m.SetHeaderData(2, core.Qt__Horizontal, core.NewQVariant1("Last Name"), 0) } func (m *EditableSqlModel) setFirstName(personId int, firstName string) bool { var query = sql.NewQSqlQuery3(db) query.Prepare("update person set firstname = ? where id = ?") - query.AddBindValue(core.NewQVariant14(firstName), 0) - query.AddBindValue(core.NewQVariant7(personId), 0) + query.AddBindValue(core.NewQVariant1(firstName), 0) + query.AddBindValue(core.NewQVariant1(personId), 0) return query.Exec2() } func (m *EditableSqlModel) setLastName(personId int, lastName string) bool { var query = sql.NewQSqlQuery3(db) query.Prepare("update person set lastname = ? where id = ?") - query.AddBindValue(core.NewQVariant14(lastName), 0) - query.AddBindValue(core.NewQVariant7(personId), 0) + query.AddBindValue(core.NewQVariant1(lastName), 0) + query.AddBindValue(core.NewQVariant1(personId), 0) return query.Exec2() } diff --git a/internal/examples/sql/querymodel/main.go b/internal/examples/sql/querymodel/main.go index aba7fba8..7c0599ba 100644 --- a/internal/examples/sql/querymodel/main.go +++ b/internal/examples/sql/querymodel/main.go @@ -12,9 +12,9 @@ import ( func initializeModel(model *sql.QSqlQueryModel) { model.SetQuery2("select * from person", db) - model.SetHeaderData(0, core.Qt__Horizontal, core.NewQVariant14("ID"), 0) - model.SetHeaderData(1, core.Qt__Horizontal, core.NewQVariant14("First name"), 0) - model.SetHeaderData(2, core.Qt__Horizontal, core.NewQVariant14("Last name"), 0) + model.SetHeaderData(0, core.Qt__Horizontal, core.NewQVariant1("ID"), 0) + model.SetHeaderData(1, core.Qt__Horizontal, core.NewQVariant1("First name"), 0) + model.SetHeaderData(2, core.Qt__Horizontal, core.NewQVariant1("Last name"), 0) } var offset int diff --git a/internal/examples/webchannel/shared/websockettransport.go b/internal/examples/webchannel/shared/websockettransport.go index feb902ef..f4dd89a0 100644 --- a/internal/examples/webchannel/shared/websockettransport.go +++ b/internal/examples/webchannel/shared/websockettransport.go @@ -34,7 +34,7 @@ func (t *WebSocketTransport) sendMessage(message *core.QJsonObject) { func (t *WebSocketTransport) textMessageReceived(messageData string) { var error *core.QJsonParseError - message := core.QJsonDocument_FromJson(core.NewQByteArray2(messageData, len(messageData)), error) + message := core.QJsonDocument_FromJson(core.NewQByteArray2(messageData, -1), error) if error.Error() != 0 { fmt.Printf("Failed to parse text message as JSON object: %v\nError is: %v\n", messageData, error.ErrorString()) diff --git a/internal/examples/webkit/browser/main.go b/internal/examples/webkit/browser/main.go index cfca3e91..bc5c82a6 100644 --- a/internal/examples/webkit/browser/main.go +++ b/internal/examples/webkit/browser/main.go @@ -80,7 +80,7 @@ func main() { stopbutton.SetMaximumSize(sx) stopbutton.ConnectClicked(func(_ bool) { stopbutton_click() }) - gif := core.NewQByteArray2("gif", len("gif")) + gif := core.NewQByteArray2("gif", -1) NavImage = gui.NewQMovie3(":/icons/loading.gif", gif, window) NavImage.SetScaledSize(core.NewQSize2(35, 35)) NavImage.SetSpeed(200) diff --git a/internal/examples/widgets/table/table.go b/internal/examples/widgets/table/table.go index 7d477c4a..9d9f1329 100644 --- a/internal/examples/widgets/table/table.go +++ b/internal/examples/widgets/table/table.go @@ -117,7 +117,7 @@ func createEditor(parent *widgets.QWidget, option *widgets.QStyleOptionViewItem, } func textchanged(text string) { - model.SetData(textIndex, core.NewQVariant14(text), 2) // edit role + model.SetData(textIndex, core.NewQVariant1(text), 2) // edit role } func setEditorData(editor *widgets.QWidget, index *core.QModelIndex) { @@ -129,7 +129,7 @@ func setEditorData(editor *widgets.QWidget, index *core.QModelIndex) { func setModelData(editor *widgets.QWidget, model *core.QAbstractItemModel, index *core.QModelIndex) { lineedit := widgets.NewQLineEditFromPointer(editor.Pointer()) text := lineedit.Text() - model.SetData(index, core.NewQVariant14(text), int(core.Qt__EditRole)) + model.SetData(index, core.NewQVariant1(text), int(core.Qt__EditRole)) } @@ -139,14 +139,14 @@ func updateEditorGeometry(editor *widgets.QWidget, option *widgets.QStyleOptionV func headerdata(section int, orientation core.Qt__Orientation, role int) *core.QVariant { if orientation == 1 && role == 0 { // Qt__Horizontal, Qt__DisplayRole - return core.NewQVariant14("column" + strconv.Itoa(section+1)) + return core.NewQVariant1("column" + strconv.Itoa(section+1)) } if orientation == 2 && role == 0 { if section < list.Size()-1 { - return core.NewQVariant14(strconv.Itoa(section + 1)) + return core.NewQVariant1(strconv.Itoa(section + 1)) } else { - return core.NewQVariant14("*") + return core.NewQVariant1("*") } } return core.NewQVariant() @@ -167,11 +167,11 @@ func data(index *core.QModelIndex, role int) *core.QVariant { switch deducedText := text.(type) { case int: { - return core.NewQVariant7(deducedText) + return core.NewQVariant1(deducedText) } case string: { - return core.NewQVariant14(deducedText) + return core.NewQVariant1(deducedText) } } } diff --git a/internal/utils/env.go b/internal/utils/env.go index 1bb66af6..87ed2beb 100644 --- a/internal/utils/env.go +++ b/internal/utils/env.go @@ -360,7 +360,7 @@ func GoList(args ...string) *exec.Cmd { var skip bool for i := 5; i <= 10; i++ { - if v := runtime.Version(); strings.Contains(v, fmt.Sprintf("go1.%v.", i)) || strings.HasSuffix(v, fmt.Sprintf("go1.%v", i)) { + if v := GOVERSION(); strings.Contains(v, fmt.Sprintf("go1.%v.", i)) || strings.HasSuffix(v, fmt.Sprintf("go1.%v", i)) { skip = true break } @@ -404,3 +404,18 @@ func QT_STATIC() bool { func QT_NOT_CACHED() bool { return os.Getenv("QT_NOT_CACHED") == "true" } + +var ( + goVersionCache string + goVersionCacheMutex = new(sync.Mutex) +) + +func GOVERSION() (r string) { + goVersionCacheMutex.Lock() + if goVersionCache == "" { + goVersionCache = strings.Split(RunCmd(exec.Command("go", "version"), "get go version"), " ")[2] + } + r = goVersionCache + goVersionCacheMutex.Unlock() + return r +}