AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d3e6e732c7
qt5base-lts/src
History
Liang Qi d3e6e732c7 Merge remote-tracking branch 'origin/5.6' into dev 
Conflicts:
	config.tests/unix/compile.test
	src/plugins/platforms/cocoa/qcocoahelpers.mm
	src/tools/qlalr/cppgenerator.cpp

Change-Id: I0103ca076a9aca7118b2fd99f0fdaf81055998c3
2016-02-02 15:57:44 +01:00
..
3rdparty Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01:00
android Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01:00
angle rework include path construction in the module system 2016-01-12 15:14:57 +00:00
concurrent Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
corelib Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01:00
dbus Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01:00
gui Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01:00
network Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01:00
opengl Updated license headers 2016-01-21 18:55:18 +00:00
openglextensions Fix typo when resolving EGL extension. 2015-04-23 11:54:36 +00:00
platformheaders Updated license headers 2016-01-15 12:25:24 +00:00
platformsupport Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01:00
plugins Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01:00
printsupport Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev 2016-01-26 11:27:37 +00:00
sql Merge remote-tracking branch 'origin/5.6' into dev 2016-01-21 08:17:21 +01:00
testlib Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01:00
tools Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01:00
widgets Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01:00
winmain winrt: handle PrelaunchActivated property to pass certification 2016-01-05 13:04:09 +00:00
xml Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev 2016-01-26 11:27:37 +00:00
src.pro rework include path construction in the module system 2016-01-12 15:14:57 +00:00