AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a15c3d086d
qt5base-lts/qmake/generators
History
Liang Qi a15c3d086d Merge remote-tracking branch 'origin/5.6' into dev 
Conflicts:
	src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
	src/dbus/qdbusconnection_p.h
	src/dbus/qdbusintegrator.cpp
	src/dbus/qdbusintegrator_p.h
	tests/auto/corelib/io/qdir/qdir.pro
	tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp

Change-Id: I3d3fd07aed015c74b1f545f1327aa73d5f365fcc
2016-01-26 16:27:28 +01:00
..
mac Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
unix Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
win32 Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
makefile.cpp Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +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 Updated license headers 2016-01-21 18:55:18 +00:00
xmloutput.h Updated license headers 2016-01-21 18:55:18 +00:00