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
..
qmake.conf	NetBSD: simplify mkspec and match supported OS versions (6.x-7.x)	2016-06-08 04:10:49 +00:00
qplatformdefs.h	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-10 23:27:10 +02:00