Commit 00a883cd authored by Quentin Derouault's avatar Quentin Derouault
Browse files

Merge branch 'feature/qt6.9' into 'develop' 

Feature/qt6.9

See merge request !143
parents 1c10de0a 49fc1707

.gitlab/pipeline/deploy.yml

+3 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ test:linux: 
    - if: $CI_COMMIT_TAG

  interruptible: true

  variables:

    qtversion: 6.8.0

    qtversion: 6.9.0

  image:

    name: "carlonluca/qt-dev:${qtversion}"

    entrypoint: [""]
@@ -73,7 +73,7 @@ test:macos: 
    - if: $CI_COMMIT_TAG

  interruptible: true

  variables:

    qtversion: 6.8.0

    qtversion: 6.9.0

  tags: 

    - qat-macos

  before_script:
@@ -109,7 +109,7 @@ test:windows: 
    - if: $CI_COMMIT_TAG

  interruptible: true

  variables:

    qtversion: 6.8.0

    qtversion: 6.9.0

  tags: 

    - qat-windows

  before_script:

.gitlab/pipeline/linux.yml

+5 −2
Original line number Diff line number Diff line
@@ -123,14 +123,17 @@ linux: 
      junit: [build/junit-report-*.xml, build/bdd-reports/TESTS-*.xml]

  parallel:

    matrix:

      - qtversion: [5.15.2, 6.2.4, 6.3.2, 6.4.2, 6.5.0, 6.6.0, 6.7.0] 

      - qtversion: [5.15.2, 6.2.4, 6.3.2, 6.4.2, 6.5.0, 6.6.0, 6.7.0, 6.8.0] 





# Run more tests and coverage with latest Qt version

linux:latest:

  extends: .linux-build

  image:

    name: "$CI_REGISTRY/testing-tool/qat/qt-dev:${qtversion}"

    entrypoint: [""]

  variables:

    qtversion: 6.8.0

    qtversion: 6.9.0

    # Used when code coverage runs in parallel

    COVERAGE_FILE: "$CI_PROJECT_DIR/build/coverage/.coverage.linux.2"

  script:

.gitlab/pipeline/macos.yml

+4 −3
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ common:macos: 
      junit: [build/junit-report-*.xml, build/bdd-reports/TESTS-*.xml]





# Build and test each Qt version (except the latest)

macos:

  extends: .macos-release

  variables:
@@ -131,10 +132,10 @@ macos: 
    - !reference [.macos-release, script]

  parallel:

    matrix:

      - qtversion: [6.2.4, 6.3.3, 6.4.3, 6.5.4, 6.6.3, 6.7.2]

      - qtversion: [6.2.4, 6.3.3, 6.4.3, 6.5.4, 6.6.3, 6.7.2, 6.8.0]





# Build and test each Qt version (except the latest)

# Build and test Qt Qt5 (Intel only)

macos:intel:

  extends: .macos-release

  variables:
@@ -151,7 +152,7 @@ macos:latest: 
  tags: 

    - qat-macos

  variables:

    qtversion: 6.8.0

    qtversion: 6.9.0

    archs: "x86_64;arm64"

    # Used when code coverage runs in parallel

    COVERAGE_FILE: "$CI_PROJECT_DIR/build/coverage/.coverage.macos.2"

.gitlab/pipeline/windows.yml

+2 −2
Original line number Diff line number Diff line
@@ -98,14 +98,14 @@ windows: 
      junit: build/junit-report-${qtversion}.xml

  parallel:

    matrix:

      - qtversion: [5.15.8, 6.2.4, 6.3.2, 6.4.3, 6.5.0, 6.6.0, 6.7.0]

      - qtversion: [5.15.8, 6.2.4, 6.3.2, 6.4.3, 6.5.0, 6.6.0, 6.7.0, 6.8.0]





# Run more tests and coverage with latest Qt version

windows:latest:

  extends: .windows-build

  variables:

    qtversion: "6.8.0"

    qtversion: "6.9.0"

  script:

    - !reference [.windows-build, script]

    - $Env:PYTHONPATH = "client"

CHANGELOG.md

+10 −0
Original line number Diff line number Diff line 
# Change Log



## 1.5.0



### General



#### *Added:*

- Compatibility with Qt 6.9.



#### *Changed:*

- Qat does not depends on Qt's _QNetwork_ library anymore as it uses its own TCP server.



## 1.4.0



### General