AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
08dea594fe
qt5base-lts/src
History
Liang Qi 38c1057f69 Merge remote-tracking branch 'origin/5.6' into 5.7 
This also reverts commit 0d2f0164f4.

Conflicts:
	header.BSD-NEW
	qmake/Makefile.win32
	src/openglextensions/qopenglextensions.cpp
	src/openglextensions/qopenglextensions.h
	src/winmain/qtmain_win.cpp
	src/winmain/qtmain_winrt.cpp
	tools/configure/configureapp.cpp
	util/glgen/qopenglextensions.cpp.header
	util/glgen/qopenglextensions.h.header

Change-Id: If26c6f4111b342378dd88bbdc657e322d2ab6ad8
2016-11-23 09:24:36 +01:00
..
3rdparty Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-13 15:18:02 +02:00
android Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-13 15:18:02 +02:00
angle ANGLE: Fix initialization of zero-sized window 2016-08-17 07:42:13 +00:00
concurrent Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-31 09:26:35 +01:00
corelib Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-23 09:24:36 +01:00
dbus Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-22 21:19:57 +02:00
gui Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-23 09:24:36 +01:00
network Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-23 09:24:36 +01:00
opengl Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-13 15:18:02 +02:00
openglextensions Also release winmain, qopenglextensions under commercial licenses 2016-11-18 16:19:56 +00:00
platformheaders Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-15 09:58:16 +01:00
platformsupport Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-15 09:58:16 +01:00
plugins Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-23 09:24:36 +01:00
printsupport Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-15 09:58:16 +01:00
sql Compile fix for DB2 sqldriver plugin 2016-10-24 07:56:50 +00:00
testlib Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-17 11:02:54 +02:00
tools Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-05 19:33:26 +02:00
widgets Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-23 09:24:36 +01:00
winmain Also release winmain, qopenglextensions under commercial licenses 2016-11-18 16:19:56 +00:00
xml Use QStringLiteral more judiciously 2016-07-08 06:43:02 +00:00
src.pro Fix compile QtGui with png support 2016-06-17 13:02:21 +00:00