Edward Welbourne f6fc34294f Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: configure 5.7 now supports clang on android; but dev re-worked configure src/gui/kernel/qevent.h One side renamed a parameter of a constructor; the other added an alternate constructor on the next line. Applied the rename to both for consistency. tests/auto/tools/moc/tst_moc.cpp Each side added a new test at the end. .qmake.conf Ignored 5.7's change to MODULE_VERSION. configure.json No conflict noticed by git; but changes in 5.7 were needed for the re-worked configure to accommodate 5.7's stricter handling of C++11. Change-Id: I9cda53836a32d7bf83828212c7ea00b1de3e09d2		2016-08-01 18:20:00 +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	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
sdk.prf	Add support for Apple tvOS	2016-05-17 16:11:23 +00:00