Some fixes / tweaks for Qt 6.8.1 and 6.9.0

Author: pcolby

.github/workflows/build.yaml

@@ -203,8 +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 } # \todo See if this is still needed.
-          - { qt: '6.9.0', cc: gcc } # \todo See if this is still needed.
+          - { qt: '6.8.1', cc: gcc }
+          # { qt: '6.9.0', cc: gcc } # \todo See if this is still needed.
     steps:
       - uses: actions/checkout@v4
       - name: Install lcov
@@ -367,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.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 }

test/unit/cli/testloggerfetchcommand.cpp

@@ -34,7 +34,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);