diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml index d5d4b5e4992..55be78ee06e 100644 --- a/.github/workflows/CI-windows.yml +++ b/.github/workflows/CI-windows.yml @@ -27,7 +27,7 @@ jobs: strategy: matrix: os: [windows-2022, windows-2025] - qt_ver: [6.9.1] + qt_ver: [6.10.0] fail-fast: false runs-on: ${{ matrix.os }} diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml index cbca3cacabc..9aaee2e719f 100644 --- a/.github/workflows/asan.yml +++ b/.github/workflows/asan.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-22.04 env: - QT_VERSION: 6.9.1 + QT_VERSION: 6.10.0 ASAN_OPTIONS: detect_stack_use_after_return=1 # TODO: figure out why there are cache misses with PCH enabled CCACHE_SLOPPINESS: pch_defines,time_macros diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index 574939e29eb..7b2c4f4e2c7 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-22.04 env: - QT_VERSION: 6.9.1 + QT_VERSION: 6.10.0 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml index 847f1f734dd..649991f9373 100644 --- a/.github/workflows/iwyu.yml +++ b/.github/workflows/iwyu.yml @@ -39,7 +39,7 @@ jobs: image: ${{ matrix.image }} env: - QT_VERSION: 6.9.1 + QT_VERSION: 6.10.0 steps: - uses: actions/checkout@v4 @@ -196,7 +196,7 @@ jobs: if: ${{ github.repository_owner == 'danmar' }} env: - QT_VERSION: 6.9.1 + QT_VERSION: 6.10.0 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index 2b5492702b8..182bd7bcd44 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -27,7 +27,7 @@ jobs: env: # see https://www.pcre.org/original/changelog.txt PCRE_VERSION: 8.45 - QT_VERSION: 6.9.1 + QT_VERSION: 6.10.0 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/selfcheck.yml b/.github/workflows/selfcheck.yml index 3e2be2c1ae6..411f0298bbb 100644 --- a/.github/workflows/selfcheck.yml +++ b/.github/workflows/selfcheck.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-22.04 env: - QT_VERSION: 6.9.1 + QT_VERSION: 6.10.0 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/tsan.yml b/.github/workflows/tsan.yml index 6742f8fa957..248d2187175 100644 --- a/.github/workflows/tsan.yml +++ b/.github/workflows/tsan.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-22.04 env: - QT_VERSION: 6.9.1 + QT_VERSION: 6.10.0 TSAN_OPTIONS: halt_on_error=1 # TODO: figure out why there are cache misses with PCH enabled CCACHE_SLOPPINESS: pch_defines,time_macros diff --git a/.github/workflows/ubsan.yml b/.github/workflows/ubsan.yml index 7a7755d091a..9ae15148c17 100644 --- a/.github/workflows/ubsan.yml +++ b/.github/workflows/ubsan.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-22.04 env: - QT_VERSION: 6.9.1 + QT_VERSION: 6.10.0 UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1:report_error_type=1 # TODO: figure out why there are cache misses with PCH enabled CCACHE_SLOPPINESS: pch_defines,time_macros diff --git a/gui/checkthread.cpp b/gui/checkthread.cpp index 6c83d0006a8..50c1f4ab8d9 100644 --- a/gui/checkthread.cpp +++ b/gui/checkthread.cpp @@ -264,7 +264,7 @@ void CheckThread::runAddonsAndTools(const Settings& settings, const FileSettings } f1.close(); } - f1.open(QIODevice::WriteOnly | QIODevice::Text); + (void)f1.open(QIODevice::WriteOnly | QIODevice::Text); // TODO: check result QTextStream out1(&f1); out1 << chksum; diff --git a/gui/fileviewdialog.cpp b/gui/fileviewdialog.cpp index bebb1f656cb..58ddb2d8109 100644 --- a/gui/fileviewdialog.cpp +++ b/gui/fileviewdialog.cpp @@ -62,7 +62,7 @@ void FileViewDialog::loadTextFile(const QString &filename, QTextEdit *edit) return; } - file.open(QIODevice::ReadOnly | QIODevice::Text); + (void)file.open(QIODevice::ReadOnly | QIODevice::Text); // TODO: check result if (!file.isReadable()) { QString msg(tr("Could not read the file: %1")); msg = msg.arg(filename); diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index f7783bbca79..c28f2f714a4 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -1717,7 +1717,7 @@ void MainWindow::complianceReport() } QTemporaryFile tempResults; - tempResults.open(); + (void)tempResults.open(); // TODO: check result tempResults.close(); mUI->mResults->save(tempResults.fileName(), Report::XMLV2, mCppcheckCfgProductName); diff --git a/releasenotes.txt b/releasenotes.txt index f77ef681038..0cf4266ef12 100644 --- a/releasenotes.txt +++ b/releasenotes.txt @@ -24,4 +24,5 @@ Other: - Added make variables `CPPOPTS` to extend existing `CPPFLAGS`. - `CPPFLAGS` are not longer being passed to the linker command for `cppcheck` and `testrunner`. - Removed deprecated platforms `unix32-unsigned` and `unix64-unsigned`. +- Updated Qt to 6.10.0 (official Windows release only). - diff --git a/tools/triage/mainwindow.cpp b/tools/triage/mainwindow.cpp index d231515cf58..ce95ff82d8d 100644 --- a/tools/triage/mainwindow.cpp +++ b/tools/triage/mainwindow.cpp @@ -112,7 +112,7 @@ void MainWindow::loadFile() if (fileName.isEmpty()) return; QFile file(fileName); - file.open(QIODevice::ReadOnly | QIODevice::Text); + (void)file.open(QIODevice::ReadOnly | QIODevice::Text); // TODO: check result QTextStream textStream(&file); load(textStream); }