lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-20 21:40:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,323 Commits 120 Branches 272 Tags
8eed3b5be400a382818a786481ce2a4f8bd2497a
Commit Graph

2 Commits

Author SHA1 Message Date
Liang Qi
91739f5fe3 Merge remote-tracking branch 'origin/5.9' into 5.11 
Conflicts:
	coin/provisioning/common/linux/open62541.sh
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
	coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh

Done-with: Maurice Kalinowski <maurice.kalinowski@qt.io>
Change-Id: Icd472b8f770a933bafead48093ecf7eb94156128
 2018-02-20 22:33:59 +01:00
Heikki Halmet
6e4f2f8433 Fix common folder paths for common split change 
Change-Id: I9d3f1ce71d7995c88005b81f7f9dc9db892e9de7
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-01-13 07:31:51 +00:00