whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/qmake/generators
History
Liang Qi ee0951d69b Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	src/network/access/qftp.cpp
	src/widgets/itemviews/qheaderview.cpp
	src/widgets/itemviews/qlistview.cpp
	tests/auto/network/access/qftp/tst_qftp.cpp

Change-Id: I9f928f25d45d8944dd60bb583f649fc1615bc5d9
 		2016-04-07 10:47:20 +02:00
..
mac Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-24 13:31:14 +01:00
unix Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-11 20:08:50 +01:00
win32 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-07 10:47:20 +02:00
makefile.cpp Merge remote-tracking branch 'origin/5.6' into dev 2016-02-11 08:25:04 +01:00
makefile.h Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
makefiledeps.cpp Add Intel copyright to files that Intel has had non-trivial contribution 2016-01-21 22:44:21 +00:00
makefiledeps.h Updated license headers 2016-01-21 18:55:18 +00:00
metamakefile.cpp Updated license headers 2016-01-21 18:55:18 +00:00
metamakefile.h Updated license headers 2016-01-21 18:55:18 +00:00
projectgenerator.cpp Updated license headers 2016-01-21 18:55:18 +00:00
projectgenerator.h Updated license headers 2016-01-21 18:55:18 +00:00
xmloutput.cpp Merge remote-tracking branch 'origin/5.6' into dev 2016-02-11 08:25:04 +01:00
xmloutput.h Updated license headers 2016-01-21 18:55:18 +00:00