Skip to content

Commit

Permalink
Upgrade to Qt 6.8.1, and 6.9.0 beta
Browse files Browse the repository at this point in the history 
Squashed commit of the following:

commit 693f19c
Author: Paul Colby <git@colby.id.au>
Date:   Mon Jan 1 18:13:46 2024 +1100

    Continue to exclude Qt 6.x with GCC on macOS

commit a6c3a5c
Author: Paul Colby <git@colby.id.au>
Date:   Mon Jan 1 18:09:15 2024 +1100

    Include the required QRegularExpression header

commit 6f078e5
Author: Paul Colby <git@colby.id.au>
Date:   Mon Jan 1 18:08:54 2024 +1100

    Some fixes / tweaks for Qt 6.8.1 and 6.9.0

commit 49be473
Author: Paul Colby <git@colby.id.au>
Date:   Mon Jan 1 18:04:45 2024 +1100

    Correct the referenced Qt version

commit eef0aaa
Author: Paul Colby <git@colby.id.au>
Date:   Mon Jan 1 18:04:40 2024 +1100

    Use aqtinstall HEAD for Qt 6.8.1 and 6.8.0 support

    At least until the fix for #843 is released (presumably in
    aqtinstall 3.1.22).

    See miurahr/aqtinstall#843 and
    miurahr/aqtinstall#857.

commit fe107e7
Merge: 24016a1 4507ccc
Author: Paul Colby <git@colby.id.au>
Date:   Mon Jan 1 18:00:00 2024 +1100

    Merge branch 'main' into qt-6.8.1

commit 24016a1
Merge: 8571331 968e509
Author: Paul Colby <git@colby.id.au>
Date:   Sun Dec 29 11:25:00 2024 +1100

    Merge branch 'main' into qt-6.8.1

commit 8571331
Author: Paul Colby <git@colby.id.au>
Date:   Thu Dec 26 18:32:54 2024 +1100

    Try Qt 6.9.0 (currently beta)

commit 9e2a846
Merge: 551ee79 c3e649c
Author: Paul Colby <git@colby.id.au>
Date:   Thu Dec 26 18:30:08 2024 +1100

    Merge branch 'main' into qt-6.8.1

commit 551ee79
Merge: f261069 5c65691
Author: Paul Colby <git@colby.id.au>
Date:   Sun Dec 22 23:01:23 2024 +1100

    Merge branch 'more-tee' into qt-6.8.1

commit f261069
Author: Paul Colby <git@colby.id.au>
Date:   Tue Dec 3 19:18:01 2024 +1100

    Upgrade to Qt 6.8.1
  • Loading branch information
@pcolby
pcolby committed Jan 2, 2025
1 parent 2ca073b commit 8ff1e29
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 13 deletions.
55 changes: 43 additions & 12 deletions .github/workflows/build.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ jobs:
- 6.5.3
- 6.6.3
- 6.7.3
- 6.8.0
- 6.8.1
- 6.9.0
cc:
- clang
- gcc
Expand Down Expand Up @@ -59,6 +60,11 @@ jobs:
${{ (startsWith(matrix.qt, '5.10.') || startsWith(matrix.qt, '5.11.')) && 'qt' ||
(startsWith(matrix.qt, '5') && 'qtcore qtbluetooth' || 'qtcore') }}
doc-modules: ${{ startsWith(matrix.qt, '6') && 'qtbluetooth' || '' }}
# \todo Use aqtinstall HEAD for Qt 6.8.1 and 6.9.0 support, until the fix for #843 is released (presumably in
# aqtinstall 3.1.22. See https://github.com/miurahr/aqtinstall/issues/843
aqtsource: >-
${{ (startsWith(matrix.qt, '6.8') || startsWith(matrix.qt, '6.9')) &&
'git+https://github.com/miurahr/aqtinstall.git' || '' }}
- name: Upload aqtinstall log file
if: failure()
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -162,7 +168,8 @@ jobs:
- 6.5.3
- 6.6.3
- 6.7.3
- 6.8.0
- 6.8.1
- 6.9.0
os:
- macos-13
- macos-14
Expand Down Expand Up @@ -196,7 +203,8 @@ jobs:
- { qt: '6.5.3', cc: gcc }
- { qt: '6.6.3', cc: gcc }
- { qt: '6.7.3', cc: gcc }
- { qt: '6.8.0', cc: gcc }
- { qt: '6.8.1', cc: gcc }
- { qt: '6.9.0', cc: gcc }
steps:
- uses: actions/checkout@v4
- name: Install lcov
Expand All @@ -212,6 +220,11 @@ jobs:
${{ (startsWith(matrix.qt, '5.10.') || startsWith(matrix.qt, '5.11.')) && 'qt' ||
(startsWith(matrix.qt, '5') && 'qtcore qtbluetooth' || 'qtcore') }}
doc-modules: ${{ startsWith(matrix.qt, '6') && 'qtbluetooth' || '' }}
# \todo Use aqtinstall HEAD for Qt 6.8.1 and 6.9.0 support, until the fix for #843 is released (presumably in
# aqtinstall 3.1.22. See https://github.com/miurahr/aqtinstall/issues/843
aqtsource: >-
${{ (startsWith(matrix.qt, '6.8') || startsWith(matrix.qt, '6.9')) &&
'git+https://github.com/miurahr/aqtinstall.git' || '' }}
- name: Upload aqtinstall log file
if: failure()
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -340,7 +353,8 @@ jobs:
- 6.5.3
- 6.6.3
- 6.7.3
- 6.8.0
- 6.8.1
- 6.9.0
arch: [ x86, x86-64, arm64 ]
toolchain: [ llvm, mingw, msvc ]
exclude:
Expand All @@ -353,9 +367,10 @@ jobs:
- { arch: arm64, qt: '5.13.2' }
- { arch: arm64, qt: '5.14.2' }
- { arch: arm64, qt: '5.15.2' }
# Also exclude arm64 for Qt 6.8 for now, as Qt 6.8 is moving to native-only (not cross-compiling) arm64 on
# Also exclude arm64 for Qt 6.8+ for now, as Qt 6.8 is moving to native-only (not cross-compiling) arm64 on
# Windows (https://www.qt.io/blog/qt-for-windows-on-arm-may21-update) and there are not compatible runners.
- { arch: arm64, qt: '6.8.0' }
- { arch: arm64, qt: '6.8.1' } # \todo Qt 6.8.1 might have restored cross-compilation.
- { arch: arm64, qt: '6.9.0' } # \todo Qt 6.9.0 might have restored cross-compilation.
# Exclude MinGW (including LLVM) builds for arm64, since Qt does not provide those binaries yet.
- { arch: arm64, toolchain: llvm }
- { arch: arm64, toolchain: mingw }
Expand All @@ -370,7 +385,8 @@ jobs:
- { arch: x86, qt: '6.5.3' }
- { arch: x86, qt: '6.6.3' }
- { arch: x86, qt: '6.7.3' }
- { arch: x86, qt: '6.8.0' }
- { arch: x86, qt: '6.8.1' }
- { arch: x86, qt: '6.9.0' }
# Exclude MinGW (including LLVM) builds for x86-64 with Qt's earlier than 5.12, since the Qt online
# installer (as used by aqtinstaller) did not include x86-64 binaries until Qt 5.12.
- { arch: x86-64, qt: '5.9.9', toolchain: llvm }
Expand All @@ -394,7 +410,8 @@ jobs:
- { toolchain: llvm, qt: '6.6.3' }
# \todo Temporarily exclude LLVM builds for Qt 6.7 and 6.8: https://github.com/miurahr/aqtinstall/issues/825
- { toolchain: llvm, qt: '6.7.3' }
- { toolchain: llvm, qt: '6.8.0' }
- { toolchain: llvm, qt: '6.8.1' }
- { toolchain: llvm, qt: '6.9.0' }
include:
# Map the aqtinstall (aqt) architectures.
- { qt: '5.9.9', toolchain: mingw, arch: x86, aqtArch: win32_mingw53 }
Expand Down Expand Up @@ -450,9 +467,12 @@ jobs:
- { qt: '6.7.3', toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
- { qt: '6.7.3', toolchain: msvc, arch: arm64, aqtArch: win64_msvc2019_arm64 }
- { qt: '6.7.3', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2019_64 }
# { qt: '6.8.0', toolchain: llvm, arch: x86-64, aqtArch: win64_llvm_mingw } \todo See temp exclusion above.
- { qt: '6.8.0', toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
- { qt: '6.8.0', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2022_64 }
# { qt: '6.8.1', toolchain: llvm, arch: x86-64, aqtArch: win64_llvm_mingw } \todo See temp exclusion above.
- { qt: '6.8.1', toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
- { qt: '6.8.1', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2022_64 }
# { qt: '6.9.0', toolchain: llvm, arch: x86-64, aqtArch: win64_llvm_mingw } \todo See temp exclusion above.
- { qt: '6.9.0', toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
- { qt: '6.9.0', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2022_64 }
# Map the MSVC architecture.
- { toolchain: msvc, arch: arm64, msvcArch: amd64_arm64 }
- { toolchain: msvc, arch: x86, msvcArch: amd64_x86 }
Expand All @@ -468,7 +488,8 @@ jobs:
- { toolchain: 'mingw', arch: x86-64, qt: '6.5.3', aqtTools: 'tools_mingw1310' }
- { toolchain: 'mingw', arch: x86-64, qt: '6.6.3', aqtTools: 'tools_mingw1310' }
- { toolchain: 'mingw', arch: x86-64, qt: '6.7.3', aqtTools: 'tools_mingw1310' }
- { toolchain: 'mingw', arch: x86-64, qt: '6.8.0', aqtTools: 'tools_mingw1310' }
- { toolchain: 'mingw', arch: x86-64, qt: '6.8.1', aqtTools: 'tools_mingw1310' }
- { toolchain: 'mingw', arch: x86-64, qt: '6.9.0', aqtTools: 'tools_mingw1310' }
steps:
- name: Configure path
if: matrix.toolchain != 'msvc'
Expand All @@ -493,6 +514,11 @@ jobs:
version: ${{ matrix.qt }}
arch: win64_msvc2019_64
set-env: false
# \todo Use aqtinstall HEAD for Qt 6.8.1 and 6.9.0 support, until the fix for #843 is released (presumably in
# aqtinstall 3.1.22. See https://github.com/miurahr/aqtinstall/issues/843
aqtsource: >-
${{ (startsWith(matrix.qt, '6.8') || startsWith(matrix.qt, '6.9')) &&
'git+https://github.com/miurahr/aqtinstall.git' || '' }}
- name: Upload aqtinstall log file
if: matrix.arch == 'arm64' && failure()
uses: actions/upload-artifact@v4
Expand All @@ -513,6 +539,11 @@ jobs:
${{ (startsWith(matrix.qt, '5.10.') || startsWith(matrix.qt, '5.11.')) && 'qt' ||
(startsWith(matrix.qt, '5') && 'qtcore qtbluetooth' || 'qtcore') }}
doc-modules: ${{ startsWith(matrix.qt, '6') && 'qtbluetooth' || '' }}
# \todo Use aqtinstall HEAD for Qt 6.8.1 and 6.9.0 support, until the fix for #843 is released (presumably in
# aqtinstall 3.1.22. See https://github.com/miurahr/aqtinstall/issues/843
aqtsource: >-
${{ (startsWith(matrix.qt, '6.8') || startsWith(matrix.qt, '6.9')) &&
'git+https://github.com/miurahr/aqtinstall.git' || '' }}
- name: Upload aqtinstall log file
if: failure()
uses: actions/upload-artifact@v4
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

- Return `quint32` from all `maxValue` methods, instead of `QVariant` ([db8b841][])
- Upgrade to Doxygen 1.13.0.
- Upgrade to Qt 6.8.1, and 6.9.0 beta.

## [0.5.3][] (2024-12-23)

Expand Down
4 changes: 3 additions & 1 deletion test/unit/cli/testloggerfetchcommand.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
#include <qtpokit/pokitmeter.h>
#include <qtpokit/pokitpro.h>

#include <QRegularExpression>

Q_DECLARE_METATYPE(AbstractCommand::OutputFormat)
Q_DECLARE_METATYPE(DataLoggerService::Metadata)

Expand All @@ -34,7 +36,7 @@ void TestLoggerFetchCommand::metadataRead()
1000, 1234, (quint32)QDateTime::currentSecsSinceEpoch()
};
LoggerFetchCommand command(this);
QTest::ignoreMessage(QtInfoMsg, "Fetching 1,234 logger sample/s...");
QTest::ignoreMessage(QtInfoMsg, QRegularExpression(QStringLiteral(R"(Fetching 1,?234 logger sample/s\.{3})")));
command.metadataRead(metadata);
QCOMPARE(command.metadata.status, metadata.status);
QCOMPARE(command.metadata.scale, metadata.scale);
Expand Down

0 comments on commit 8ff1e29

Please sign in to comment.