whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/src/gui
History
Liang Qi dd90af1221 Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	mkspecs/common/mac.conf
	mkspecs/features/configure_base.prf
	mkspecs/features/configure.prf
	mkspecs/macx-clang-32/qmake.conf
	mkspecs/macx-clang/qmake.conf
	mkspecs/macx-ios-clang/qmake.conf
	src/network/ssl/qsslsocket_openssl_symbols_p.h

Change-Id: I768b592e8e589662b1fdb9b8cbd633fef26845b6
 		2016-06-23 14:24:55 +02:00
..
accessible Drop most "#ifndef QT_NO_LIBRARY" 2016-02-08 10:40:33 +00:00
animation Updated license headers 2016-01-15 12:25:24 +00:00
doc Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
image Merge remote-tracking branch 'origin/5.7' into dev 2016-06-21 08:39:41 +02:00
itemmodels Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
kernel Merge remote-tracking branch 'origin/5.7' into dev 2016-06-21 08:39:41 +02:00
math3d QGenericMatrix<N,M,T>: mark as relocatable, depending on T 2016-03-01 16:08:52 +00:00
opengl Merge remote-tracking branch 'origin/5.7' into dev 2016-06-23 14:24:55 +02:00
painting Merge remote-tracking branch 'origin/5.7' into dev 2016-06-23 14:24:55 +02:00
text Merge remote-tracking branch 'origin/5.7' into dev 2016-06-21 08:39:41 +02:00
util Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
Qt5GuiConfigExtras.cmake.in Add default path to CFLAGS for OpenGL 2014-12-16 11:48:40 +01:00
QtGui.dynlist
…
gui.pro Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-11 20:08:50 +01:00