qt6-bb10

Author	SHA1	Message	Date
Liang Qi	790aef362f	Merge remote-tracking branch 'origin/5.6' into dev Conflicts: .qmake.conf configure src/corelib/global/qglobal.h src/tools/qdoc/node.cpp src/tools/qdoc/qdocdatabase.cpp tests/auto/corelib/io/qsettings/tst_qsettings.cpp tools/configure/configureapp.cpp Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f	2015-10-23 14:45:03 +02:00
Thiago Macieira	9d1fab424e	Make the C++11 atomic support the default, if available Change-Id: Ib056b47dde3341ef9a52ffff13ef1647ccd607b1 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>	2015-10-16 18:52:00 +00:00
Friedemann Kleint	76cf88157f	Tests: Remove CONFIG += parallel_test. The keyword no longer has a meaning for the new CI. Change-Id: Ibcea4c7a82fb7f982cf4569fdff19f82066543d1 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>	2015-09-05 07:16:50 +00:00
Thiago Macieira	212285639d	Add missing fetchAndXxx methods to atomic classes based on std::atomic And add tests for the GCC intrinsics and for std::atomic. Task-number: QTBUG-43794 Change-Id: Ic5d393bfd36e48a193fcffff13b9b2dbaee80469 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>	2015-03-05 00:05:00 +00:00
Thiago Macieira	aba30f0234	Replace the type-based QAtomicIntegerTraits with a size-based one This simplifies the code a lot and avoids silly mistakes where a specific integer type is missing (such as char16_t). Change-Id: Id91dfd1919e783e0a9af7bfa093ca560a01b22d1 Reviewed-by: Lars Knoll <lars.knoll@digia.com>	2014-01-30 18:06:27 +01:00