diff --git a/.github/workflows/build-ubuntu-aarch64.yml b/.github/workflows/build-ubuntu-aarch64.yml index 1b4c8d4b..c06b50ed 100644 --- a/.github/workflows/build-ubuntu-aarch64.yml +++ b/.github/workflows/build-ubuntu-aarch64.yml @@ -33,7 +33,7 @@ jobs: rm /etc/apt/sources.list mv /etc/apt/sources.list{.new,} apt update - DEBIAN_FRONTEND=noninteractive apt install -y {gcc-10,g++-10,pkg-config}-aarch64-linux-gnu {libsdl2,qtbase5,qtbase5-private-dev,qtmultimedia5,libslirp,libarchive}-dev:arm64 cmake extra-cmake-modules dpkg-dev + DEBIAN_FRONTEND=noninteractive apt install -y {gcc-10,g++-10,pkg-config}-aarch64-linux-gnu {libsdl2,qtbase5,qtbase5-private,qtmultimedia5,libslirp,libarchive}-dev:arm64 cmake extra-cmake-modules dpkg-dev - name: Configure shell: bash run: | diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp index eb6ce4a7..d60108da 100644 --- a/src/frontend/qt_sdl/main.cpp +++ b/src/frontend/qt_sdl/main.cpp @@ -1278,11 +1278,11 @@ bool ScreenPanelGL::createContext() qreal ScreenPanelGL::devicePixelRatioFromScreen() const { - const QScreen* screen_for_ratio = screen(); - if (!screen_for_ratio) + const QScreen* screen_for_ratio = window()->windowHandle()->screen(); + if (!screen_for_ratio) screen_for_ratio = QGuiApplication::primaryScreen(); - return screen_for_ratio ? screen_for_ratio->devicePixelRatio() : static_cast(1); + return screen_for_ratio ? screen_for_ratio->devicePixelRatio() : static_cast(1); } int ScreenPanelGL::scaledWindowWidth() const