whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/src/corelib
History
Liang Qi ea438b2508 Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qsysinfo.h
	src/corelib/kernel/qcoreapplication_win.cpp
	src/gui/text/qdistancefield.cpp
	src/gui/text/qdistancefield_p.h
	src/plugins/platforms/windows/qwindowsglcontext.cpp
	src/plugins/platforms/windows/qwindowsglcontext.h

Change-Id: Ib3500acc2b28553bde06758cd9a2e19eb7fe2978
 		2016-06-21 08:39:41 +02:00
..
animation Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-10 23:27:10 +02:00
arch QtCore: Remove Windows CE. 2016-03-30 11:22:47 +00:00
codecs Aarch64: vectorize ascii de-/encoding. 2016-06-09 08:06:04 +00:00
doc Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
global Merge remote-tracking branch 'origin/5.7' into dev 2016-06-21 08:39:41 +02:00
io Merge remote-tracking branch 'origin/5.7' into dev 2016-06-21 08:39:41 +02:00
itemmodels Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
json Merge remote-tracking branch 'origin/5.7' into dev 2016-06-17 10:53:42 +02:00
kernel Merge remote-tracking branch 'origin/5.7' into dev 2016-06-21 08:39:41 +02:00
mimetypes Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
plugin Merge remote-tracking branch 'origin/5.7' into dev 2016-06-17 10:53:42 +02:00
statemachine Merge remote-tracking branch 'origin/5.7' into dev 2016-05-23 21:09:46 +02:00
thread Merge remote-tracking branch 'origin/5.7' into dev 2016-06-21 08:39:41 +02:00
tools Merge remote-tracking branch 'origin/5.7' into dev 2016-06-21 08:39:41 +02:00
xml Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-10 23:27:10 +02:00
Qt5CTestMacros.cmake Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
Qt5Config.cmake.in
…
Qt5CoreConfigExtras.cmake.in CMake: Add imported target for qdoc. 2016-06-05 08:38:38 +00:00
Qt5CoreConfigExtrasMkspecDir.cmake.in
…
Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
…
Qt5CoreMacros.cmake Merge remote-tracking branch 'origin/5.6' into dev 2016-01-12 11:07:56 +01:00
QtCore.dynlist
…
corelib.pro Merge remote-tracking branch 'origin/5.7' into dev 2016-05-23 21:09:46 +02:00
eval.pri
…
qtzlib.pro make a proper header-only module for QtZlib 2015-11-17 20:22:17 +00:00