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
..
arch	Update the Intel copyright year	2016-01-21 22:44:16 +00:00
common	configure: check whether std::atomic<T> works for function pointers	2016-06-09 15:58:23 +00:00
mac/corewlan	Updated license headers	2016-01-15 12:25:24 +00:00
qpa	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-06 09:04:55 +02:00
unix	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-10 23:27:10 +02:00
win	Windows/Configure tests: Test for DirectWrite2 more extensively.	2016-04-26 11:14:48 +00:00
x11	Updated license headers	2016-01-15 12:25:24 +00:00
.gitignore	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
.qmake.conf	Handle INCLUDE and LIB environment variables in config.tests for MinGW	2013-11-22 07:30:57 +01:00