lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-24 16:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,220 Commits 119 Branches 271 Tags
c2d188f225a96ccf409f4dbebd19f6e59caf7da6
Commit Graph

3 Commits

Author SHA1 Message Date
Liang Qi
c2d188f225 Merge remote-tracking branch 'origin/5.10' into dev 
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Task-number: QTBUG-65688
Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10
 2018-01-12 21:13:56 +01:00
Liang Qi
19872ea843 Merge remote-tracking branch 'origin/5.9' into 5.10 
Fixed up provisioning script locations after the reshuffeling into
common/platform folders.

Change-Id: Ia0b7d076e475ccc207f2955572fb9ab4171e5d9d
 2018-01-11 15:13:13 +01:00
Heikki Halmet
2a28ce864b Split Common folder based on operating system families 
This change will split common folder to four different folders:
Linux, Unix, Windows and MacOS. Each of these folders includes scripts
which are common for their operating system familes

Task-number: QTQAINFRA-1451
Change-Id: Ic93b2183052335dee875d1452b21e38d268b6474
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
 2018-01-10 07:58:26 +00:00