whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/src/concurrent
History
Liang Qi a732576a66 Merge remote-tracking branch 'origin/5.7' into 5.8 
Conflicts:
	config.tests/win/msvc_version.cpp
	configure.pri
	mkspecs/macx-ios-clang/features/default_post.prf
	mkspecs/macx-ios-clang/features/resolve_config.prf
	mkspecs/features/uikit/default_post.prf
	mkspecs/features/uikit/resolve_config.prf
	src/corelib/io/qsettings_mac.cpp
	src/corelib/json/qjsondocument.cpp
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/cocoa/qnswindowdelegate.h
	src/plugins/platforms/cocoa/qnswindowdelegate.mm
	src/plugins/platforms/ios/ios.pro
	src/plugins/platforms/ios/kernel.pro
	src/plugins/platforms/ios/qiosintegration.h
	src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
	tests/auto/gui/painting/qpainter/tst_qpainter.cpp
	tools/configure/environment.cpp

Change-Id: I654845e54e40f5951fb78aab349ca667e9f27843
 		2016-11-01 06:02:55 +01:00
..
doc Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-31 09:26:35 +01:00
concurrent.pro QtConcurrent: use QDeadlineTimer to get the clock tick 2016-09-15 19:43:57 +00:00
qtconcurrent_global.h Updated license headers 2016-01-15 12:25:24 +00:00
qtconcurrentcompilertest.h Updated license headers 2016-01-15 12:25:24 +00:00
qtconcurrentexception.h Updated license headers 2016-01-15 12:25:24 +00:00
qtconcurrentfilter.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qtconcurrentfilter.h Updated license headers 2016-01-15 12:25:24 +00:00
qtconcurrentfilterkernel.h Updated license headers 2016-01-15 12:25:24 +00:00
qtconcurrentfunctionwrappers.h Updated license headers 2016-01-15 12:25:24 +00:00
qtconcurrentiteratekernel.cpp QtConcurrent: use QDeadlineTimer to get the clock tick 2016-09-15 19:43:57 +00:00
qtconcurrentiteratekernel.h Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
qtconcurrentmap.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qtconcurrentmap.h Updated license headers 2016-01-15 12:25:24 +00:00
qtconcurrentmapkernel.h Updated license headers 2016-01-15 12:25:24 +00:00
qtconcurrentmedian.h Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
qtconcurrentreducekernel.h Updated license headers 2016-01-15 12:25:24 +00:00
qtconcurrentrun.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qtconcurrentrun.h Updated license headers 2016-01-15 12:25:24 +00:00
qtconcurrentrunbase.h Updated license headers 2016-01-15 12:25:24 +00:00
qtconcurrentstoredfunctioncall.h Updated license headers 2016-01-15 12:25:24 +00:00
qtconcurrentthreadengine.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qtconcurrentthreadengine.h Updated license headers 2016-01-15 12:25:24 +00:00