diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-15 13:15:40 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-15 13:24:54 +0200 |
| commit | 5ef4ad5e90e86731542a5620dc500ec4da40c9d6 (patch) | |
| tree | ee798e10633f87253b389410f2b5343582d29702 /qtquickcontrols2 | |
| parent | a2dc8d6c2141bce84fe9619d5ee6851e73de8a95 (diff) | |
| parent | df53ff5f85f69932538cc1c571b86b0c2a885a10 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmakewip/cmake
Bringing in new SHA1s, and updated cmake-specific configurations.
Intended for Qt6 Installer essentials package creation.
Conflicts
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
Change-Id: I6abc2d952ae75785e34b70977e41018a72acf5bc
Diffstat (limited to 'qtquickcontrols2')
| m--------- | qtquickcontrols2 | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject 4e1e01c4e484337586a7419e28c3625055f8803 +Subproject 4f3ebbedc79ae4d9f3031c8d1e8176eee82ee20 |