AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5e51b15066
qt5base-lts/qmake/generators
History
Liang Qi dbef41f43e Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	examples/qtestlib/tutorial5/containers.cpp
	examples/widgets/tools/tools.pro
	src/corelib/io/qprocess.cpp
	src/corelib/io/qprocess_unix.cpp
	src/corelib/io/qprocess_win.cpp
	src/network/kernel/qdnslookup_unix.cpp
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/testlib/qtestcase.cpp
	tools/configure/configureapp.cpp

Change-Id: I838ae7f082535a67a4a53aa13a21ba5580758be8
2016-05-06 15:36:44 +02:00
..
mac Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-25 14:03:45 +02: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 5.7 2016-05-06 15:36:44 +02:00
makefile.h Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
makefiledeps.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-29 17:55:20 +02:00
makefiledeps.h Updated license headers 2016-01-21 18:55:18 +00:00
metamakefile.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-29 17:55:20 +02: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