mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-02 03:36:54 +08:00
Conflicts: .gitmodules coin/platform_configs/default.yaml coin/platform_configs/flashing-wizard.yaml coin/platform_configs/qt5.yaml coin/platform_configs/qtbase.yaml coin/platform_configs/qtconnectivity.yaml coin/platform_configs/tqtc-qt-config-gui.yaml coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh Change-Id: I7af8a52d8b4452211982d86105dafacdd3d845c0