diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-09-13 11:15:16 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-09-13 11:15:16 +0200 |
| commit | 5ae23f8c6644bc990c6c5132b15d27c0b1287ea7 (patch) | |
| tree | e303987b0f871158826c3ac08adbdb3b16f054a1 /.github | |
| parent | fbd4775f899cda7a802cbdbec8e596ed8a0358de (diff) | |
| parent | 67408ac1830a3d2493273cd74fe2941b38ba4b87 (diff) | |
| download | qt-creator-5ae23f8c6644bc990c6c5132b15d27c0b1287ea7.tar.gz | |
Merge remote-tracking branch 'origin/8.0'
Conflicts:
.github/workflows/build_cmake.yml
src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp
src/plugins/qmldesigner/components/materialeditor/materialeditorview.h
src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
src/plugins/qmldesigner/designercore/model/model.cpp
Change-Id: I111b9140375b894a5487cc012b17cc32100bdb8d
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build_cmake.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 0784db70a7..a99d71736f 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -7,7 +7,7 @@ on: - 'doc/**' env: - QT_VERSION: 6.3.1 + QT_VERSION: 6.3.2 CLANG_VERSION: 15.0.0 ELFUTILS_VERSION: 0.175 CMAKE_VERSION: 3.21.1 |