whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/src/concurrent
History
Liang Qi cbe332405a Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	configure
	mkspecs/macx-ios-clang/features/default_pre.prf
	mkspecs/macx-ios-clang/features/sdk.prf
	mkspecs/unsupported/freebsd-g++46/qplatformdefs.h
	src/widgets/styles/qgtkstyle.cpp
	tests/auto/corelib/io/qdiriterator/qdiriterator.pro
	tests/auto/corelib/io/qfileinfo/qfileinfo.pro

Change-Id: Ia943555d1e59234a66f7dc65bdfda838e40001b5
 		2016-06-10 23:27:10 +02:00
..
doc Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
concurrent.pro QtConcurrent/QtOpenGL(Extensions)/QtPrintSupport/QtTestLib/QtXml: add QT_NO_FOREACH 2016-05-12 21:42:10 +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 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-10 23:27:10 +02: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