AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
b894a8def5
qt5base-lts/qmake/generators
History
Liang Qi b894a8def5 Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	mkspecs/features/qml_module.prf
	mkspecs/features/qt_common.prf
	src/gui/text/qzip.cpp
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/platforms/windows/array.h
	src/testlib/qtestcase.cpp
	src/widgets/dialogs/qfilesystemmodel.h

Change-Id: Ie41c5868415b81f7693c80e045497035504bb210
2016-04-29 17:55:20 +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 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 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