Edward Welbourne 6c5de416c9 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/corelib/io/qtemporarydir.cpp One side encapsulated a repeated piece of #if-ery in a local define; the other added to the #if-ery. Made its addition to the other's. src/corelib/kernel/qeventdispatcher_unix_p.h One side moved some members into a struct; this collided with a #undef check that neither side now has. Discarded the #undef part. src/gui/opengl/qopengltexturehelper_p.h 5.7 deleted a bunch of methods; not clear why merge got confused. src/tools/moc/moc.cpp One added a name to the copyright header; another changed its URL. Change-Id: I9e9032b819f030d67f1915445acf2793e98713fa		2016-07-26 10:43:29 +02:00
..
arch	PowerPC: Add detection of SPE (found on e500) and VSX	2016-06-19 18:46:26 +00:00
common	move c++11 test into qcompilerdetection.h and make it stricter	2016-07-22 10:21:36 +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-07-26 10:43:29 +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