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
..
unsupported	Add tool to namespace Objective-C classes at link time	2016-01-29 14:41:21 +00:00
default_post.prf	sanitize qt rpath handling, in particular on mac	2015-09-17 16:36:12 +00:00
default_pre.prf	configure and mkspecs: Don't try to find xcrun with xcrun	2016-07-21 15:36:33 +00:00
objective_c.prf	Distinguish between Objective-C and Objective-C++ sources	2015-10-09 15:15:17 +00:00
rez.prf	…
sdk.prf	xcodeSDKInfo: return the correct path based on the specified SDK.	2016-02-18 04:34:05 +00:00