diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 7221617..4b4e153 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: include: - - qt_ver: '6.10.3' + - qt_ver: '6.11.2' vs: '2022' aqt_arch: 'win64_msvc2022_64' msvc_arch: 'x64' @@ -24,6 +24,8 @@ jobs: version: ${{ matrix.qt_ver }} modules: 'qtimageformats' cache: true + # we need this until miurahr/aqtinstall#1007 ships 3.3.1 for Qt >= 6.11.0 for Windows. + aqtsource: 'aqtinstall @ git+https://github.com/miurahr/aqtinstall@16db45a70b5905ad596941b223469bc86a56901e' - name: Build shell: cmd run: | diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp index 743e1a8..8a7bf30 100644 --- a/app/mainwindow.cpp +++ b/app/mainwindow.cpp @@ -357,7 +357,7 @@ void MainWindow::leaveEvent(QEvent *event) void MainWindow::mousePressEvent(QMouseEvent *event) { -#if defined(Q_OS_WIN) +#if defined(Q_OS_WIN) and QT_VERSION < QT_VERSION_CHECK(6, 11, 2) const bool shouldAcceptDrag = !isMaximized() && !isFullScreen(); #else const bool shouldAcceptDrag = !isFullScreen(); diff --git a/app/titlebar.cpp b/app/titlebar.cpp index 1fa6942..8b438cc 100644 --- a/app/titlebar.cpp +++ b/app/titlebar.cpp @@ -136,7 +136,7 @@ void TitleBar::mouseMoveEvent(QMouseEvent *event) } } -#if defined(Q_OS_WIN) +#if defined(Q_OS_WIN) and QT_VERSION < QT_VERSION_CHECK(6, 11, 2) const bool shouldAcceptDrag = !window()->isMaximized() && !window()->isFullScreen(); #else const bool shouldAcceptDrag = !window()->isFullScreen();