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
..
moc	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-07-26 10:43:29 +02:00
qdbuscpp2xml	Updated license headers	2016-01-21 18:55:18 +00:00
qdbusxml2cpp	Updated license headers	2016-01-21 18:55:18 +00:00
qmake	make extra compiler targets depend on their respective compiler	2016-04-18 09:38:10 +00:00
qmakelib	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-07-15 20:47:57 +02:00
rcc	Updated license headers	2016-01-21 18:55:18 +00:00
uic	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-11 20:08:50 +01:00
tools.pro	add test for the qmake library	2015-02-25 13:54:33 +00:00