AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e91abaa48e
qt5base-lts/qmake/generators
History
Liang Qi bb4b86618d Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	config.tests/unix/compile.test
	configure
	src/android/jar/src/org/qtproject/qt5/android/QtMessageDialogHelper.java
	src/corelib/global/qglobal.cpp
	src/widgets/kernel/qapplication.cpp
	src/widgets/styles/qwindowsvistastyle.cpp
	tests/auto/corelib/kernel/qobject/tst_qobject.cpp

Change-Id: I067083f34e5290aa5f7565e40c30a069cc37b83a
2016-04-25 14:03:45 +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-25 14:03:45 +02: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