From 4668305eb6d916d31fed3dfa6f22cf755f3d22a9 Mon Sep 17 00:00:00 2001 From: lebarsfa Date: Sat, 27 Apr 2024 19:59:31 +0200 Subject: [PATCH 1/9] Add keys to be able to change font size --- viewer/figure2d.cpp | 15 +++++++++++++-- viewer/figure2d.h | 2 ++ viewer/vibeswindow.cpp | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/viewer/figure2d.cpp b/viewer/figure2d.cpp index 304f036..d47e2df 100644 --- a/viewer/figure2d.cpp +++ b/viewer/figure2d.cpp @@ -15,7 +15,8 @@ Figure2D::Figure2D(QWidget *parent) : QGraphicsView(parent), lbProjX(new QLabel("xlabelhere",this)), lbProjY(new QLabel("ylabelhere",this)), - showAxis(true) + showAxis(true), + fontSize(11) { setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform); @@ -169,7 +170,7 @@ void Figure2D::drawForeground(QPainter *painter, const QRectF &rect) painter->setTransform(QTransform()); painter->setWindow(this->viewport()->rect()); - QFont axisTicksFont("Helvetica", 11); + QFont axisTicksFont("Helvetica", fontSize); axisTicksFont.setStyleHint(QFont::Helvetica); painter->setFont(axisTicksFont); painter->setPen(QColor(0,0,0)); @@ -246,6 +247,16 @@ void Figure2D::keyPressEvent(QKeyEvent *event) case Qt::Key_W: this->scale(0.8,0.8); break; + case Qt::Key_Asterisk: + case Qt::Key_F: + this->fontSize = this->fontSize < 512? this->fontSize+1: 512; + this->scene()->update(); + break; + case Qt::Key_Slash: + case Qt::Key_V: + this->fontSize = this->fontSize > 1? this->fontSize-1: 1; + this->scene()->update(); + break; default: QGraphicsView::keyPressEvent(event); } diff --git a/viewer/figure2d.h b/viewer/figure2d.h index c2635e5..0b04339 100644 --- a/viewer/figure2d.h +++ b/viewer/figure2d.h @@ -33,6 +33,8 @@ class Figure2D : public QGraphicsView // bool to indicate if axis needs to be drawn or not bool showAxis; + + int fontSize; signals: public slots: diff --git a/viewer/vibeswindow.cpp b/viewer/vibeswindow.cpp index e33d6e0..feb31e5 100644 --- a/viewer/vibeswindow.cpp +++ b/viewer/vibeswindow.cpp @@ -515,7 +515,7 @@ void VibesWindow::exportCurrentFigureGraphics() void VibesWindow::openHelpDialog() { - QMessageBox::information(this, "VIBes", tr("Open a figure: O or double-click\nHide a figure: H\nClose a figure: DEL\nEdit group properties: P or double-click\nRight-click on an item opens a menu with the same options")); + QMessageBox::information(this, "VIBes", tr("Open a figure: O or double-click\nHide a figure: H\nClose a figure: DEL\nChange font size: * and /\nEdit group properties: P or double-click\nRight-click on an item opens a menu with the same options")); } void VibesWindow::readFile() From 23e7746a671f71cf4b5e728a2bad7c651d5ecdcb Mon Sep 17 00:00:00 2001 From: lebarsfa Date: Mon, 29 Apr 2024 22:56:35 +0200 Subject: [PATCH 2/9] Adjust numbers position when font size changes --- viewer/figure2d.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/viewer/figure2d.cpp b/viewer/figure2d.cpp index d47e2df..90e85e1 100644 --- a/viewer/figure2d.cpp +++ b/viewer/figure2d.cpp @@ -185,7 +185,7 @@ void Figure2D::drawForeground(QPainter *painter, const QRectF &rect) xtick_txt.setNum(xtick, 'f', 0); else xtick_txt.setNum(xtick, 'g'); - painter->drawText(x_wnd+4,12, xtick_txt); + painter->drawText(x_wnd+3,fontSize+3, xtick_txt); } for (double ytick=y0; ytickdrawText(2, y_wnd+12, ytick_txt); + painter->drawText(3, y_wnd+fontSize+3, ytick_txt); } } From cdea6e779e33805e094d84b8352468773c5ed900 Mon Sep 17 00:00:00 2001 From: lebarsfa Date: Mon, 29 Apr 2024 23:46:25 +0200 Subject: [PATCH 3/9] Add keys to change axis ticks --- viewer/figure2d.cpp | 32 +++++++++++++++++++++++++++++--- viewer/figure2d.h | 2 ++ 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/viewer/figure2d.cpp b/viewer/figure2d.cpp index 90e85e1..1ddc995 100644 --- a/viewer/figure2d.cpp +++ b/viewer/figure2d.cpp @@ -16,7 +16,9 @@ Figure2D::Figure2D(QWidget *parent) : lbProjX(new QLabel("xlabelhere",this)), lbProjY(new QLabel("ylabelhere",this)), showAxis(true), - fontSize(11) + fontSize(11), + xTicksSpacing(50), + yTicksSpacing(35) { setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform); @@ -145,8 +147,8 @@ void Figure2D::drawForeground(QPainter *painter, const QRectF &rect) //painter->drawRect(this->sceneRect()); // Min spacing between ticks (divisor is min spacing in px) - double nb_ticks_x = this->viewport()->width() / 50.0; - double nb_ticks_y = this->viewport()->height() / 35.0; + double nb_ticks_x = this->viewport()->width() / (double)xTicksSpacing; + double nb_ticks_y = this->viewport()->height() / (double)yTicksSpacing; int log_scale_x = ceil(log10(rect.width()/nb_ticks_x)*3.0); double scale_x = pow(10.0, floor((double)log_scale_x/3)); @@ -247,6 +249,22 @@ void Figure2D::keyPressEvent(QKeyEvent *event) case Qt::Key_W: this->scale(0.8,0.8); break; + case Qt::Key_X: + this->xTicksSpacing = this->xTicksSpacing < 512? this->xTicksSpacing+1: 512; + this->scene()->update(); + break; + case Qt::Key_S: + this->xTicksSpacing = this->xTicksSpacing > 1? this->xTicksSpacing-1: 1; + this->scene()->update(); + break; + case Qt::Key_Y: + this->yTicksSpacing = this->yTicksSpacing < 512? this->yTicksSpacing+1: 512; + this->scene()->update(); + break; + case Qt::Key_H: + this->yTicksSpacing = this->yTicksSpacing > 1? this->yTicksSpacing-1: 1; + this->scene()->update(); + break; case Qt::Key_Asterisk: case Qt::Key_F: this->fontSize = this->fontSize < 512? this->fontSize+1: 512; @@ -257,6 +275,14 @@ void Figure2D::keyPressEvent(QKeyEvent *event) this->fontSize = this->fontSize > 1? this->fontSize-1: 1; this->scene()->update(); break; + case Qt::Key_Space: + // Back to default settings + this->showAxis = true; + this->xTicksSpacing = 50; + this->yTicksSpacing = 35; + this->fontSize = 11; + this->scene()->update(); + break; default: QGraphicsView::keyPressEvent(event); } diff --git a/viewer/figure2d.h b/viewer/figure2d.h index 0b04339..36e059c 100644 --- a/viewer/figure2d.h +++ b/viewer/figure2d.h @@ -35,6 +35,8 @@ class Figure2D : public QGraphicsView bool showAxis; int fontSize; + int xTicksSpacing; + int yTicksSpacing; signals: public slots: From 7364dc9c93d6e4904515f22521edabbcb5221aac Mon Sep 17 00:00:00 2001 From: lebarsfa Date: Mon, 29 Apr 2024 21:58:16 +0200 Subject: [PATCH 4/9] Additional info about supported keys in Figure2D --- viewer/vibeswindow.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/viewer/vibeswindow.cpp b/viewer/vibeswindow.cpp index feb31e5..283111b 100644 --- a/viewer/vibeswindow.cpp +++ b/viewer/vibeswindow.cpp @@ -515,7 +515,17 @@ void VibesWindow::exportCurrentFigureGraphics() void VibesWindow::openHelpDialog() { - QMessageBox::information(this, "VIBes", tr("Open a figure: O or double-click\nHide a figure: H\nClose a figure: DEL\nChange font size: * and /\nEdit group properties: P or double-click\nRight-click on an item opens a menu with the same options")); + QMessageBox::information(this, "VIBes", tr("Open a figure: O or double-click\n" + "Hide a figure: H\n" + "Close a figure: DEL\n" + "Edit group properties: P or double-click\n" + "Right-click on an item opens a menu with the same options\n" + "Zoom in: + or Q\n" + "Zoom out: - or W\n" + "Toggle axis view: A\n" + "Change axis ticks: repeated press on X, S, Y, H\n" + "Change font size: * or F and / or V\n" + "Default view settings: SPACE")); } void VibesWindow::readFile() From 19fb7387f5e030d24a59869a4170f8a760c17865 Mon Sep 17 00:00:00 2001 From: lebarsfa Date: Sat, 27 Apr 2024 20:02:30 +0200 Subject: [PATCH 5/9] Arbitrarily doubling the size of exported graphics does not seem necessary any more --- viewer/figure2d.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/viewer/figure2d.cpp b/viewer/figure2d.cpp index 1ddc995..41f5cda 100644 --- a/viewer/figure2d.cpp +++ b/viewer/figure2d.cpp @@ -330,7 +330,7 @@ void Figure2D::exportGraphics(QString fileName) || fileName.endsWith(".png", Qt::CaseInsensitive) || fileName.endsWith(".bmp", Qt::CaseInsensitive)) { - QImage image(this->size()*2, QImage::Format_ARGB32); + QImage image(this->size(), QImage::Format_ARGB32); image.fill(QColor(255,255,255,0)); QPainter painter; painter.begin(&image); From 17fd04a48f3918beba25d18bd532c26954c66c17 Mon Sep 17 00:00:00 2001 From: lebarsfa Date: Wed, 1 May 2024 16:53:45 +0200 Subject: [PATCH 6/9] Update CMakeLists.txt --- viewer/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/viewer/CMakeLists.txt b/viewer/CMakeLists.txt index b963bbf..cf0641f 100644 --- a/viewer/CMakeLists.txt +++ b/viewer/CMakeLists.txt @@ -130,5 +130,5 @@ install(DIRECTORY ../client-api/C++/src DESTINATION "Vibes C++") install(DIRECTORY ../client-api/C++/examples DESTINATION "Vibes C++") add_library(VIBES STATIC ../client-api/C++/src/vibes.h ../client-api/C++/src/vibes.cpp) -install(TARGETS VIBES LIBRARY DESTINATION lib) +install(TARGETS VIBES ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) install(FILES ../client-api/C++/src/vibes.h DESTINATION include) From a1899ff07e4678eece79a1e09b1c91ca8e804b3c Mon Sep 17 00:00:00 2001 From: lebarsfa Date: Wed, 1 May 2024 18:28:25 +0200 Subject: [PATCH 7/9] Generate a self-extracting executable for Windows --- .github/workflows/unixmatrix.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unixmatrix.yml b/.github/workflows/unixmatrix.yml index 2409735..5ebf7fe 100644 --- a/.github/workflows/unixmatrix.yml +++ b/.github/workflows/unixmatrix.yml @@ -104,7 +104,18 @@ jobs: if [ ${{ matrix.cfg.arch }} = 'x86' ]; then cp -f /c/ProgramData/chocolatey/lib/mingw/tools/install/mingw*/bin/libgcc_s_dw2-1.dll VIBes-viewer/ ; else cp -f /c/ProgramData/chocolatey/lib/mingw/tools/install/mingw*/bin/libgcc_s_seh-1.dll VIBes-viewer/ ; fi cp -rf /c/ProgramData/chocolatey/lib/mingw/tools/install/mingw*/bin/libstdc++-6.dll VIBes-viewer/ - zip -q -r ./VIBes-viewer_${{ matrix.cfg.arch }}.zip VIBes-viewer/ + #wget https://www.7-zip.org/a/lzma2301.7z --no-check-certificate -nv + #7z x lzma2301.7z -o"lzma2301" -y + wget https://github.com/github/ghfw-build-extra/raw/69bd5e6f85e4842f07db71c9618a621154c52254/7-Zip/7zSD.sfx --no-check-certificate -nv + echo ';!@Install@!UTF-8!'>config.txt + echo 'RunProgram="VIBes-viewer\VIBes-viewer.exe"'>>config.txt + echo 'GUIMode="2"'>>config.txt + echo ';!@InstallEnd@!'>>config.txt + 7z a VIBes-viewer.7z VIBes-viewer -y + #cmd //c "copy /b /y lzma2301\\bin\\7zSD.sfx + config.txt + VIBes-viewer.7z VIBes-viewer_${{ matrix.cfg.arch }}.exe" + cmd //c "copy /b /y 7zSD.sfx + config.txt + VIBes-viewer.7z VIBes-viewer_${{ matrix.cfg.arch }}.exe" + rm -rf VIBes-viewer.7z + #zip -q -r ./VIBes-viewer_${{ matrix.cfg.arch }}.zip VIBes-viewer/ rm -rf VIBes-viewer/ cd ../.. shell: bash From 7fac2b78c716eee1596c499f3c7b8b145e072ea8 Mon Sep 17 00:00:00 2001 From: lebarsfa Date: Wed, 1 May 2024 18:35:33 +0200 Subject: [PATCH 8/9] Update build instructions related to Qt --- .github/workflows/dockermatrix.yml | 5 +++-- .github/workflows/unixmatrix.yml | 4 ++-- README.md | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dockermatrix.yml b/.github/workflows/dockermatrix.yml index 17c0ca3..f9bc6d3 100644 --- a/.github/workflows/dockermatrix.yml +++ b/.github/workflows/dockermatrix.yml @@ -31,9 +31,9 @@ jobs: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes if: (matrix.cfg.arch!='x86_64')&&(matrix.cfg.arch!='i386') - run: | - docker run ${{ matrix.cfg.docker_flags }} -i -v "${PWD}/..:${PWD}/.." ${{ matrix.cfg.img }} /bin/bash -c "uname -a ; cat /etc/os-release ; apt-get -q update --allow-releaseinfo-change ; export DEBIAN_FRONTEND=noninteractive ; export UCF_FORCE_CONFFOLD=1 ; apt-get -y install sudo apt-transport-https ca-certificates gnupg gnupg-agent qt5-default libqt5svg5-dev cmake git build-essential libfuse2 lsb-release file wget --no-install-recommends ; \ + docker run ${{ matrix.cfg.docker_flags }} -i -v "${PWD}/..:${PWD}/.." ${{ matrix.cfg.img }} /bin/bash -c "uname -a ; cat /etc/os-release ; apt-get -q update --allow-releaseinfo-change ; export DEBIAN_FRONTEND=noninteractive ; export UCF_FORCE_CONFFOLD=1 ; apt-get -y install sudo apt-transport-https ca-certificates gnupg gnupg-agent qtbase5-dev libqt5svg5-dev cmake git build-essential libfuse2 patchelf lsb-release file wget --no-install-recommends ; \ uname -a ; cat /etc/os-release ; lsb_release -a ; cd ${PWD} && pwd && \ - sudo apt-get -q update && sudo apt-get -y install qt5-default libqt5svg5-dev cmake git build-essential libfuse2 lsb-release file wget || true && \ + sudo apt-get -q update && sudo apt-get -y install qtbase5-dev libqt5svg5-dev cmake git build-essential libfuse2 patchelf lsb-release file wget || true && \ cd viewer && \ mkdir build ; cd build && \ cmake ${{ matrix.cfg.cmake_params }} .. && \ @@ -54,6 +54,7 @@ jobs: ./appimagetool-*.AppImage -s deploy AppDir/usr/share/applications/VIBes-viewer.desktop && \ ./appimagetool-*.AppImage AppDir && \ mv -f ./VIBes-viewer*.AppImage ./VIBes-viewer_${{ matrix.cfg.arch }}.AppImage && \ + rm -rf ./VIBes-viewer_automoc.cpp ; \ cd ../.." - uses: xresloader/upload-to-github-release@v1 env: diff --git a/.github/workflows/unixmatrix.yml b/.github/workflows/unixmatrix.yml index 5ebf7fe..77a4fd9 100644 --- a/.github/workflows/unixmatrix.yml +++ b/.github/workflows/unixmatrix.yml @@ -76,8 +76,8 @@ jobs: choco install -y -r --no-progress aqt --version=3.1.9 ${{ matrix.cfg.choco_flags }} choco install -y -r --no-progress qt5-default --version=5.15.2.20240217 --params "'/Path'" ${{ matrix.cfg.choco_flags }} if: startsWith(matrix.cfg.runtime, 'mingw')&&(matrix.cfg.arch=='x86') - # - run: sudo apt-get -q update ; sudo apt-get -y install qt6-base-dev libgl1-mesa-dev libqt6svg6-dev cmake git build-essential libfuse2 || true - - run: sudo apt-get -q update ; sudo apt-get -y install qt5-default libqt5svg5-dev cmake git build-essential libfuse2 || true + # - run: sudo apt-get -q update ; sudo apt-get -y install qt6-base-dev libgl1-mesa-dev libqt6svg6-dev cmake git build-essential libfuse2 patchelf || true + - run: sudo apt-get -q update ; sudo apt-get -y install qtbase5-dev libqt5svg5-dev cmake git build-essential libfuse2 patchelf || true if: runner.os=='Linux' - run: | brew install qt@5 diff --git a/README.md b/README.md index 3d32f36..44c015b 100644 --- a/README.md +++ b/README.md @@ -22,11 +22,11 @@ The use of a separate viewer application enables an easy set-up on every system. You should have git, cmake, qt5/6 and its svg module installed. On a Debian-like distribution, you can install them via: ```bash -sudo apt-get install qt6-base-dev libgl1-mesa-dev libqt6svg6-dev cmake git build-essential +sudo apt-get install qtbase5-dev libqt5svg5-dev cmake git build-essential ``` or ```bash -sudo apt-get install qt5-default qtbase5-dev libqt5svg5-dev cmake git build-essential +sudo apt-get install qt6-base-dev libgl1-mesa-dev libqt6svg6-dev cmake git build-essential ``` Note that `qt5-default` package might not be always available nor mandatory. You might also have issues if you have both qt5 and qt6 installed on your system, so try to check carefully which packages you really need. From 7fc0d74e7c60333e30bddcaf2932fd07bf4504ad Mon Sep 17 00:00:00 2001 From: lebarsfa Date: Wed, 1 May 2024 18:41:22 +0200 Subject: [PATCH 9/9] Generate a .appimage differently --- .github/workflows/dockermatrix.yml | 21 +++++++++++---------- .github/workflows/unixmatrix.yml | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/dockermatrix.yml b/.github/workflows/dockermatrix.yml index f9bc6d3..4d5ef7d 100644 --- a/.github/workflows/dockermatrix.yml +++ b/.github/workflows/dockermatrix.yml @@ -1,11 +1,11 @@ on: push: -# branches: '**' + branches: '**' # branches: 'master' - branches: 'devel' +# branches: 'devel' tags: '' # Restrict to blank tags pull_request: - branches: 'devel' +# branches: 'devel' jobs: dockermatrix: @@ -18,10 +18,11 @@ jobs: matrix: cfg: # - # Still /bin/bash: ./appimagetool-828-aarch64.AppImage: cannot execute binary file: Exec format error for both configurations, need to run on a Mac vm... + # Still /bin/bash: ./appimagetool-831-aarch64.AppImage: cannot execute binary file: Exec format error for both configurations, need to run on a Mac vm... # - - { img: 'lebarsfa/pi-64:focal-for-codac', shell: bash, arch: arm64, bitness: 64, runtime: focal, desc: 'Ubuntu 20.04 arm64' } + #- { img: 'lebarsfa/pi-64:focal-for-codac', shell: bash, arch: arm64, bitness: 64, runtime: focal, desc: 'Ubuntu 20.04 arm64' } #- { img: 'arm64v8/ubuntu:focal', shell: bash, arch: arm64, bitness: 64, runtime: focal, docker_flags: '--platform linux/arm64', desc: 'Ubuntu 20.04 arm64' } + - { img: 'amd64/ubuntu:focal', shell: bash, arch: amd64, bitness: 64, runtime: focal, docker_flags: '--platform linux/amd64', desc: 'Ubuntu 20.04 amd64' } name: ${{ matrix.cfg.desc }} steps: - uses: actions/checkout@v4 @@ -29,15 +30,15 @@ jobs: sudo apt-get -y install qemu binfmt-support qemu-user-static || true #docker run --rm --privileged multiarch/qemu-user-static:register --reset docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - if: (matrix.cfg.arch!='x86_64')&&(matrix.cfg.arch!='i386') + if: (matrix.cfg.arch!='amd64')&&(matrix.cfg.arch!='x86_64')&&(matrix.cfg.arch!='i386') - run: | - docker run ${{ matrix.cfg.docker_flags }} -i -v "${PWD}/..:${PWD}/.." ${{ matrix.cfg.img }} /bin/bash -c "uname -a ; cat /etc/os-release ; apt-get -q update --allow-releaseinfo-change ; export DEBIAN_FRONTEND=noninteractive ; export UCF_FORCE_CONFFOLD=1 ; apt-get -y install sudo apt-transport-https ca-certificates gnupg gnupg-agent qtbase5-dev libqt5svg5-dev cmake git build-essential libfuse2 patchelf lsb-release file wget --no-install-recommends ; \ + docker run ${{ matrix.cfg.docker_flags }} --privileged -i -v "${PWD}/..:${PWD}/.." ${{ matrix.cfg.img }} /bin/bash -c "uname -a ; cat /etc/os-release ; apt-get -q update ; export DEBIAN_FRONTEND=noninteractive ; export UCF_FORCE_CONFFOLD=1 ; apt-get -y install sudo apt-transport-https ca-certificates gnupg gnupg-agent qtbase5-dev libqt5svg5-dev cmake git build-essential libfuse2 lsb-release file wget --no-install-recommends ; \ uname -a ; cat /etc/os-release ; lsb_release -a ; cd ${PWD} && pwd && \ sudo apt-get -q update && sudo apt-get -y install qtbase5-dev libqt5svg5-dev cmake git build-essential libfuse2 patchelf lsb-release file wget || true && \ cd viewer && \ mkdir build ; cd build && \ cmake ${{ matrix.cfg.cmake_params }} .. && \ - cmake --build . -j 4 --config Release && \ + cmake --build . --config Release && \ cd ../.. && \ cd viewer/build && \ cp -rf ../AppDir AppDir && \ @@ -51,8 +52,8 @@ jobs: chmod +x appimagetool-*.AppImage && \ file ./appimagetool-*.AppImage && \ uname -a ; cat /etc/os-release ; lsb_release -a && \ - ./appimagetool-*.AppImage -s deploy AppDir/usr/share/applications/VIBes-viewer.desktop && \ - ./appimagetool-*.AppImage AppDir && \ + ./appimagetool-*.AppImage --appimage-extract-and-run -s deploy AppDir/usr/share/applications/VIBes-viewer.desktop && \ + ./appimagetool-*.AppImage --appimage-extract-and-run AppDir && \ mv -f ./VIBes-viewer*.AppImage ./VIBes-viewer_${{ matrix.cfg.arch }}.AppImage && \ rm -rf ./VIBes-viewer_automoc.cpp ; \ cd ../.." diff --git a/.github/workflows/unixmatrix.yml b/.github/workflows/unixmatrix.yml index 77a4fd9..9e0363f 100644 --- a/.github/workflows/unixmatrix.yml +++ b/.github/workflows/unixmatrix.yml @@ -32,7 +32,7 @@ jobs: - { os: windows-2022, shell: cmd, arch: x86, bitness: 32, runtime: vc16, cmake_params: '-G "Visual Studio 17" -T v142 -A Win32', choco_flags: '--x86', desc: 'Windows Visual Studio 2019 x86' } - { os: windows-2022, shell: cmd, arch: x64, bitness: 64, runtime: mingw11, cmake_params: '-G "MinGW Makefiles"', desc: 'Windows MinGW 11.2.0 x64' } - { os: windows-2019, shell: cmd, arch: x86, bitness: 32, runtime: mingw8, cmake_params: '-G "MinGW Makefiles"', choco_flags: '--x86', desc: 'Windows MinGW 8.1.0 x86' } - - { os: ubuntu-20.04, shell: bash, arch: amd64, bitness: 64, runtime: focal, desc: 'Ubuntu 20.04 amd64' } # See https://github.com/probonopd/linuxdeployqt/issues/340. + #- { os: ubuntu-20.04, shell: bash, arch: amd64, bitness: 64, runtime: focal, desc: 'Ubuntu 20.04 amd64' } # See https://github.com/probonopd/linuxdeployqt/issues/340. # # Still problems for macOS arm64, generated app does not run possibly due to Qt6 problems and Qt5 does not seem supported either, also mandatory code signing of apps might complicate things... # Current workaround is to use Intel app with Rosetta...